From: <ah...@us...> - 2011-11-06 15:54:27
|
Revision: 13159 http://jvcl.svn.sourceforge.net/jvcl/?rev=13159&view=rev Author: ahuser Date: 2011-11-06 15:54:21 +0000 (Sun, 06 Nov 2011) Log Message: ----------- Faster access to CompInstall.dll from the setup Modified Paths: -------------- trunk/jvcl/install/ISS/BuildSetup.bat trunk/jvcl/install/ISS/ComponentInstallerScript.iss Modified: trunk/jvcl/install/ISS/BuildSetup.bat =================================================================== --- trunk/jvcl/install/ISS/BuildSetup.bat 2011-11-06 15:40:59 UTC (rev 13158) +++ trunk/jvcl/install/ISS/BuildSetup.bat 2011-11-06 15:54:21 UTC (rev 13159) @@ -39,10 +39,10 @@ SET JvclLib=%JVCLBUILTDIR%\lib\win32 cd %JVCLROOT% -msbuild make.proj "/p:Platform=win32" "/p:HppOutDir=%JVCLBUILTDIR%\hpp" "/p:DcuOutDir=%JVCLBUILTDIR%\lib\win32" "/p:BplOutDir=%JVCLBUILTDIR%\bpl" "/p:JclLibDir=%JCLBUILTDIR%\lib\win32" -v:d +msbuild make.proj "/p:Platform=win32" "/p:HppOutDir=%JVCLBUILTDIR%\hpp" "/p:DcuOutDir=%JVCLBUILTDIR%\lib\win32" "/p:BplOutDir=%JVCLBUILTDIR%\bpl" "/p:JclLibDir=%JCLBUILTDIR%\lib\win32" if ERRORLEVEL 1 goto Failed if not exist "%BDS%\bin\dcc64.exe" goto NoWin64 -msbuild make.proj "/p:Platform=win64" "/p:HppOutDir=%JVCLBUILTDIR%\hpp64" "/p:DcuOutDir=%JVCLBUILTDIR%\lib\win64" "/p:BplOutDir=%JVCLBUILTDIR%\bpl\Win64" "/p:JclLibDir=%JCLBUILTDIR%\lib\win64" -v:d +msbuild make.proj "/p:Platform=win64" "/p:HppOutDir=%JVCLBUILTDIR%\hpp64" "/p:DcuOutDir=%JVCLBUILTDIR%\lib\win64" "/p:BplOutDir=%JVCLBUILTDIR%\bpl\Win64" "/p:JclLibDir=%JCLBUILTDIR%\lib\win64" if ERRORLEVEL 1 goto Failed :: For 64bit we have to install both win32 and lib\win64 SET JvclLib=%JVCLBUILTDIR%\lib Modified: trunk/jvcl/install/ISS/ComponentInstallerScript.iss =================================================================== --- trunk/jvcl/install/ISS/ComponentInstallerScript.iss 2011-11-06 15:40:59 UTC (rev 13158) +++ trunk/jvcl/install/ISS/ComponentInstallerScript.iss 2011-11-06 15:54:21 UTC (rev 13159) @@ -1,5 +1,5 @@ [Files] -Source: CompInstall.dll; DestDir: {app}; +Source: CompInstall.dll; DestDir: {app}; Flags: solidbreak [Code] type This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |