[Gsdesign-commits] r310 - pkg/gsDesignExplorer-dev/branches/visualstudio/gsDesignExplorer

[noreply at r-forge.r-project.org]

Author: tonypujals
Date: 2011-08-12 22:34:21 +0200 (Fri, 12 Aug 2011)
New Revision: 310

Modified:
   pkg/gsDesignExplorer-dev/branches/visualstudio/gsDesignExplorer/Makefile.vstudio
   pkg/gsDesignExplorer-dev/branches/visualstudio/gsDesignExplorer/environment.cmd
   pkg/gsDesignExplorer-dev/branches/visualstudio/gsDesignExplorer/gsDesignExplorer.vcxproj
Log:
Updates to makefile

Modified: pkg/gsDesignExplorer-dev/branches/visualstudio/gsDesignExplorer/Makefile.vstudio
===================================================================
--- pkg/gsDesignExplorer-dev/branches/visualstudio/gsDesignExplorer/Makefile.vstudio	2011-08-10 20:30:47 UTC (rev 309)
+++ pkg/gsDesignExplorer-dev/branches/visualstudio/gsDesignExplorer/Makefile.vstudio	2011-08-12 20:34:21 UTC (rev 310)
@@ -1,6 +1,39 @@
-all: environment
+# gsDesignExplorer project base directory
+PROJECTROOT=%CD%
+
+# PATH TO VISUAL STUDIO TOOLCHAIN
+# ===============================
+INCLUDE=C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\INCLUDE;C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\ATLMFC\INCLUDE;C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\include;
+LIB=C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\LIB;C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\ATLMFC\LIB;C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\lib;
+LIBPATH=C:\Windows\Microsoft.NET\Framework\v4.0.30319;C:\Windows\Microsoft.NET\Framework\v3.5;C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\LIB;C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\ATLMFC\LIB;
+VSPATH=C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE\;C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\BIN;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\Tools;C:\Windows\Microsoft.NET\Framework\v4.0.30319;C:\Windows\Microsoft.NET\Framework\v3.5;C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\VCPackages;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Performance Tools;C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\bin\NETFX 4.0 Tools;C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\bin;
+
+
+# PATH TO INSTALLED TOOLS
+# =======================
+RPATH=C:\dev\tools\R\R-2.13.1
+# RTOOLS=C:\dev\tools\Rtools
+# QTDIR=C:\QtSDK\Desktop\Qt\4.7.3\MSVC2008
+
+# PATH TO VERSIONED TOOLS
+# =======================
+QTDIR=$(PROJECTROOT)\libs\msvc\Qt\4.7.3\msvc2008
+
+
+
+PATH=$(VSPATH);$(QTDIR)\bin;$(RPATH)\bin;$(PATH);C:\dev\tools\cmake\cmake-2.8.4\bin
+
+
+
+
+all :
 	cd ..
 	R CMD INSTALL --no-clean-on-error gsDesignExplorer
 
-environment:
-	environment.cmd
+create-r-import-lib :
+	pushd $(RPATH)\bin\i386
+	tools\DLLImportTool\ImgDef.exe R.dll > R.def
+	popd
+	mv $(RPATH)\bin\i386\R.def libs\msvc\R\R-2.13.1
+	lib /machine:x86 /subsystem:windows /def:libs\msvc\R\R-2.13.1\R.def /out:libs\msvc\R\R-2.13.1\R.lib
+

Modified: pkg/gsDesignExplorer-dev/branches/visualstudio/gsDesignExplorer/environment.cmd
===================================================================
--- pkg/gsDesignExplorer-dev/branches/visualstudio/gsDesignExplorer/environment.cmd	2011-08-10 20:30:47 UTC (rev 309)
+++ pkg/gsDesignExplorer-dev/branches/visualstudio/gsDesignExplorer/environment.cmd	2011-08-12 20:34:21 UTC (rev 310)
@@ -5,8 +5,8 @@
 rem HKEY_CURRENT_USER\Software\Microsoft\Command Processor
 rem String value -> autorun = c:\dev\cmd\profile.cmd
 
-rem use %CWD% as a prefix to create fully-qualified paths
-set CWD=echo cd
+rem gsDesignExplorer project base directory
+set PROJECTROOT=%CD%
 
 rem PATH TO VISUAL STUDIO TOOLCHAIN
 rem ===============================
@@ -24,7 +24,7 @@
 
 rem PATH TO VERSIONED TOOLS
 rem =======================
-set QTDIR=%CWD%\libs\msvc\Qt\4.7.3\msvc2008
+set QTDIR=%PROJECTROOT%\libs\msvc\Qt\4.7.3\msvc2008
 
 
 

Modified: pkg/gsDesignExplorer-dev/branches/visualstudio/gsDesignExplorer/gsDesignExplorer.vcxproj
===================================================================
--- pkg/gsDesignExplorer-dev/branches/visualstudio/gsDesignExplorer/gsDesignExplorer.vcxproj	2011-08-10 20:30:47 UTC (rev 309)
+++ pkg/gsDesignExplorer-dev/branches/visualstudio/gsDesignExplorer/gsDesignExplorer.vcxproj	2011-08-12 20:34:21 UTC (rev 310)
@@ -34,7 +34,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <NMakeBuildCommandLine>R CMD INSTALL --no-clean-on-error gsDesignExplorer</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine>nmake -f Makefile.vstudio</NMakeBuildCommandLine>
     <NMakePreprocessorDefinitions>WIN32;_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">