]> Creatis software - creaToolsTools.git/commitdiff
DFCH: Install_ThirdParty script is now working in windows x64 =)
authorDiego Caceres <Diego.Caceres@creatis.insa-lyon.fr>
Thu, 12 Jul 2012 17:03:13 +0000 (17:03 +0000)
committerDiego Caceres <Diego.Caceres@creatis.insa-lyon.fr>
Thu, 12 Jul 2012 17:03:13 +0000 (17:03 +0000)
Install_ThirdParty/cmake/crea_ThirdParty_Libraries/install/CMakeLists.txt
Install_ThirdParty/install_generate_thirdparty.bat_TEMPLATE
Install_ThirdParty/scripts/cleanAll.bat [new file with mode: 0644]
Install_ThirdParty/scripts/download_ThirdPartySW.bat
Install_ThirdParty/scripts/generateThirdPartyLibExe.bat
Install_ThirdParty/scripts/generateThirdPartydllsExe.bat
Install_ThirdParty/scripts/install_thirdparty.bat [deleted file]
Install_ThirdParty/scripts/install_thirdparty_all.bat
Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat
Install_ThirdParty/scripts/move_thirdparty_dlls.bat
Install_ThirdParty/scripts/move_thirdparty_libraries.bat

index 7a82a097548cf9964a233dd494900e8289ba492b..c84ce232cea16a13061c29c33fe07b2ad481721e 100644 (file)
@@ -56,7 +56,7 @@ IF(WIN32 AND NOT UNIX)
   set  (CREA_VTK_LYBRARY       vtk )  
   set  (CREA_WXWIN_LYBRARY     wxWidgets)
   set  (CREA_XERCES_LYBRARY    xerces)
-  set  (CREA_MIKATEX_LYBRARY miktex)
+  #DFCH -- set  (CREA_MIKATEX_LYBRARY miktex)
   
   #set  (CREA_KWWIDGETS_LYBRARY   KWWidgets-090109 )
   
@@ -92,7 +92,7 @@ IF (WIN32)
           )
        ENDFOREACH(iLST)        
        
-       INSTALL(DIRECTORY ${CREA_LIBRARY_SOURCE_PATH}\\\\${CREA_MIKATEX_LYBRARY}        DESTINATION ${CREA_BIN_DESTINATION_PATH} )
+        #DFCH -- INSTALL(DIRECTORY ${CREA_LIBRARY_SOURCE_PATH}\\\\${CREA_MIKATEX_LYBRARY}      DESTINATION ${CREA_BIN_DESTINATION_PATH} )
        INSTALL(DIRECTORY ${CREA_LIBRARY_SOURCE_PATH}\\\\${CREA_BOOST_LYBRARY}  DESTINATION ${CREA_LIBRARY_DESTINATION_PATH} )
        INSTALL(DIRECTORY ${CREA_LIBRARY_SOURCE_PATH}\\\\${CREA_GDCM_LYBRARY}   DESTINATION ${CREA_LIBRARY_DESTINATION_PATH} )
        INSTALL(DIRECTORY ${CREA_LIBRARY_SOURCE_PATH}\\\\${CREA_ITK_LYBRARY}    DESTINATION ${CREA_LIBRARY_DESTINATION_PATH} )
@@ -102,8 +102,8 @@ IF (WIN32)
        INSTALL(DIRECTORY ${CREA_LIBRARY_SOURCE_PATH}\\\\${CREA_XERCES_LYBRARY} DESTINATION ${CREA_LIBRARY_DESTINATION_PATH} )
 
        
-       SET(MIKTEX_INSTALL_DIR "$INSTDIR\\\\bin\\\\MiKTeX-2.9\\\\miktex\\\\bin")
-       SET(CREATIS_THIRDPARTYLIBRARIES_DIRS ";${MIKTEX_INSTALL_DIR}")
+        #DFCH -- SET(MIKTEX_INSTALL_DIR "$INSTDIR\\\\bin\\\\MiKTeX-2.9\\\\miktex\\\\bin")
+        #DFCH -- SET(CREATIS_THIRDPARTYLIBRARIES_DIRS ";${MIKTEX_INSTALL_DIR}")
 
        SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS  "        
                WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'TTH' '$INSTDIR\\\\bin\\\\tth' 
index 76e5b7fa37642cfd9dca7ca62194cc8724ad1ffb..37756bb61019b4e7e9a4fc6f4cc24b7db04691b8 100644 (file)
@@ -5,7 +5,8 @@ echo ---Setting Environment Variables---
 echo -----------------------------------
 
 set thirdpartyGeneration=<directory where you want to generate>
-set buildType=<debug|release>
+set buildType=<debug|release|RelWithDebInfo>
+
 ::The following line sets wxWidgets version. Set it ON if you want to compile wxWidgets 2.8.12
 ::The following line set swxWidgets version. Set it OFF if you want to compile wxWidgets 2.9.3
 set wxStable=<ON|OFF>
@@ -30,30 +31,36 @@ time /t
 date /T
 
 set scripts=%cd%\scripts
+set LogFolder=%thirdpartyGeneration%\installLog
+cd %scripts%
+
+echo cleaning All
+
+call cleanAll.bat %thirdpartyGeneration%
 
 cd %scripts%
 
 echo Calling download_ThirdPartySW.bat
 
-call download_ThirdPartySW.bat %thirdpartyGeneration% %buildType% %wxStable% >> downloadThirdParty.log 2>&1
+call download_ThirdPartySW.bat %thirdpartyGeneration% %buildType% %wxStable% >> %LogFolder%\downloadSources.log 2>&1
 
 cd %scripts%
 
 echo Calling install_thirdparty.bat
 
-start /wait install_thirdparty.bat %thirdpartyGeneration% %buildType% %forcex86%
+start /B /wait install_thirdparty_all.bat %thirdpartyGeneration% %buildType% %forcex86%
 
 echo Calling generateThirdPartydllsExe.bat
 
 cd %scripts%
 
-start /wait generateThirdPartydllsExe.bat %thirdpartyGeneration% %buildType% %forcex86%
+start /B /wait generateThirdPartydllsExe.bat %thirdpartyGeneration% %buildType% %forcex86%
 
 echo Calling generateThirdPartyLibExe.bat
 
 cd %scripts%
 
-start /wait generateThirdPartyLibExe.bat %thirdpartyGeneration% %buildType% %forcex86%
+start /B /wait generateThirdPartyLibExe.bat %thirdpartyGeneration% %buildType% %forcex86%
 
 cd..
 
@@ -65,6 +72,8 @@ echo ending time
 time /t
 date /T
 
-pause
+echo To see the log of this install please go to %LogFolder%
+
+::pause
 
 exit
\ No newline at end of file
diff --git a/Install_ThirdParty/scripts/cleanAll.bat b/Install_ThirdParty/scripts/cleanAll.bat
new file mode 100644 (file)
index 0000000..f80598f
--- /dev/null
@@ -0,0 +1,25 @@
+@echo off
+
+set thirdpartyGeneration=%1
+
+set installpath=%thirdpartyGeneration%\thirdparty_install\%buildType%
+set binpath=%thirdpartyGeneration%\thirdparty_bin\%buildType%
+set sourcepath=%thirdpartyGeneration%\thirdparty_source\%buildType%
+set LogFolder=%thirdpartyGeneration%\installLog
+
+echo -----------------------------------
+echo -------Removing Folders------------
+echo -----------------------------------
+
+rmdir /S /Q %thirdpartyGeneration%
+
+echo -----------------------------------
+echo -------Creating Folders------------
+echo -----------------------------------
+
+mkdir %thirdpartyGeneration%
+cd  %thirdpartyGeneration%
+mkdir %sourcepath%
+mkdir %binpath%
+mkdir %installpath%
+mkdir %LogFolder%
\ No newline at end of file
index c76da1e0e8748bb4efe39b25d3511768681577d8..a5745d32dd1b77a3a0304ec23b42ca0ba9186772 100644 (file)
@@ -55,6 +55,7 @@ if not exist %wgetPath% (
 set installpath=%thirdpartyGeneration%\thirdparty_install\%buildType%
 set binpath=%thirdpartyGeneration%\thirdparty_bin\%buildType%
 set sourcepath=%thirdpartyGeneration%\thirdparty_source\%buildType%
+set LogFolder=%thirdpartyGeneration%\installLog
 
 set QTFNAME=qt-everywhere-opensource-src-4.8.2.zip
 
@@ -89,22 +90,6 @@ echo InstallPath=%installpath%
 echo BinPath=%binpath%
 echo SourcePath=%sourcepath%
 
-echo -----------------------------------
-echo -------Removing Folders------------
-echo -----------------------------------
-
-rmdir /S /Q %thirdpartyGeneration%
-
-echo -----------------------------------
-echo -------Creating Folders------------
-echo -----------------------------------
-
-mkdir %thirdpartyGeneration%
-cd  %thirdpartyGeneration%
-mkdir %sourcepath%
-mkdir %binpath%
-mkdir %installpath%
-
 echo -----------------------------------
 echo ------Downloading Sources----------
 echo -----------------------------------
@@ -217,27 +202,5 @@ rename xerces-c-3.1.1 xerces
 echo -----End of Download Libraries-----
 echo -----------------------------------
 echo -----------------------------------
-echo -----------------------------------
-echo -----------------------------------
-echo -----------------------------------
-echo -----------------------------------
-echo -----------------------------------
-echo -----------------------------------
-echo -----------------------------------
-echo -----------------------------------
-echo -----------------------------------
-echo -----------------------------------
-echo -----------------------------------
-echo -----------------------------------
-echo -----------------------------------
-echo -----------------------------------
-echo -----------------------------------
-echo -----------------------------------
-echo -----------------------------------
-echo -----------------------------------
-echo -----------------------------------
-echo -----------------------------------
-echo -----------------------------------
-echo -----------------------------------
 
 exit /B
\ No newline at end of file
index cef5541d07bdb6b0c0d50fc1a38da0f9b795ac98..4294739be587ad2a01390d02b287f5690dbdd78d 100644 (file)
@@ -4,12 +4,14 @@ set thirdpartyGeneration=%1
 set buildType=%2
 set x86Comp=%3
 
+set LogFolder=%thirdpartyGeneration%\installLog
+
 echo Calling move_thirdparty_libraries.bat
 
-call move_thirdparty_libraries.bat %thirdpartyGeneration% %buildType% %x86Comp% >> generateThirdpartyLibExe.log 2>&1
+call move_thirdparty_libraries.bat %thirdpartyGeneration% %buildType% %x86Comp% >> %LogFolder%\generateThirdpartyLibExe.log 2>&1
 
 echo Calling install_thirdparty_libraries_cmake.bat
 
-call install_thirdparty_libraries_cmake.bat  %thirdpartyGeneration% %buildType% %x86Comp% >> generateThirdpartyLibExe.log 2>&1
+call install_thirdparty_libraries_cmake.bat  %thirdpartyGeneration% %buildType% %x86Comp% >> %LogFolder%\generateThirdpartyLibExe.log 2>&1
 
 exit
\ No newline at end of file
index 71ef1ffb8ba5c49a622ea5537f65994ac2b44f95..92ef1cf4494cce978813a201b9a33cdbebe3e815 100644 (file)
@@ -4,12 +4,14 @@ set thirdpartyGeneration=%1
 set buildType=%2
 set x86Comp=%3
 
+set LogFolder=%thirdpartyGeneration%\installLog
+
 echo Calling move_thirdparty_dlls.bat
 
-call move_thirdparty_dlls.bat %thirdpartyGeneration% %buildType% %x86Comp% >> generateThirdpartydllsExe.log 2>&1
+call move_thirdparty_dlls.bat %thirdpartyGeneration% %buildType% %x86Comp% >> %LogFolder%\generateThirdpartydllsExe.log 2>&1
 
 echo Calling install_thirdparty_dlls_cmake.bat
 
-call install_thirdparty_dlls_cmake.bat  %thirdpartyGeneration% %buildType% %x86Comp% >> generateThirdpartydllsExe.log 2>&1
+call install_thirdparty_dlls_cmake.bat  %thirdpartyGeneration% %buildType% %x86Comp% >> %LogFolder%\generateThirdpartydllsExe.log 2>&1
 
 exit
\ No newline at end of file
diff --git a/Install_ThirdParty/scripts/install_thirdparty.bat b/Install_ThirdParty/scripts/install_thirdparty.bat
deleted file mode 100644 (file)
index bcd0f3d..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-@echo off
-
-set thirdpartyGeneration=%1
-set buildType=%2
-set x86Comp=%3
-
-echo Calling install_thirdparty_all.bat
-
-call install_thirdparty_all.bat  %thirdpartyGeneration% %buildType% %x86Comp% >> installThirdParty.log 2>&1
-
-exit
index 3ddd0781183c86f939054d876763588a1a99ae3e..0f1631875c315bb8fa95e5752f63ed1a39efd96f 100644 (file)
@@ -49,6 +49,7 @@ set XERCESDIR=%sourcepath%\%xercesc%
 set ITKSRCDIR=%sourcepath%\%itk%
 set VTKSRCDIR=%sourcepath%\%VTK%
 set GDCMSRCDIR=%sourcepath%\%gdcm%
+set LogFolder=%thirdpartyGeneration%\installLog
 
 echo -----------------------------------
 echo Environment variables Configuration
@@ -97,9 +98,9 @@ echo -----------------------------------
 cd %QTDIR%
 set QMAKESPEC=win32-msvc2010
 
-echo y | configure -%buildType% -opensource -shared -qt-sql-sqlite -phonon -phonon-backend -platform win32-msvc2010 -mp
+echo y | configure -%buildType% -opensource -shared -qt-sql-sqlite -phonon -phonon-backend -platform win32-msvc2010 -mp >> %LogFolder%\qtInstall.log 2>&1
 
-%JOMDIR%\jom.exe -j %NUMBER_OF_PROCESSORS%
+%JOMDIR%\jom.exe -j %NUMBER_OF_PROCESSORS% >> %LogFolder%\qtInstall.log 2>&1
 
 cd C:\
 
@@ -108,12 +109,12 @@ echo -----wxWidgets Installation--------
 echo -----------------------------------
 cd %WXDIR%\build\msw
 if %x86Comp%==ON (
-       nmake -f makefile.vc BUILD=%buildType% UNICODE=0 SHARED=1 USE_OPENGL=1
+       nmake -f makefile.vc BUILD=%buildType% UNICODE=0 SHARED=1 USE_OPENGL=1 >> %LogFolder%\wxInstall.log 2>&1
 ) else (
        if %PROCESSOR_ARCHITECTURE%==x86 (
-               nmake -f makefile.vc BUILD=%buildType% UNICODE=0 SHARED=1 USE_OPENGL=1
+               nmake -f makefile.vc BUILD=%buildType% UNICODE=0 SHARED=1 USE_OPENGL=1 >> %LogFolder%\wxInstall.log 2>&1
        ) else (
-               nmake -f makefile.vc TARGET_CPU=AMD64 BUILD=release UNICODE=0 SHARED=1 USE_OPENGL=1
+               nmake -f makefile.vc TARGET_CPU=AMD64 BUILD=release UNICODE=0 SHARED=1 USE_OPENGL=1 >> %LogFolder%\wxInstall.log 2>&1
        )
 )
 cd C:\
@@ -127,15 +128,15 @@ mkdir %installpath%\%boost%
 
 cd %sourcepath%\%boost%
 
-call bootstrap.bat
+call bootstrap.bat >> %LogFolder%\boostInstall.log 2>&1
 
 if %x86Comp%==ON (
-       bjam.exe -j %NUMBER_OF_PROCESSORS% --prefix=%installpath%\%boost% --toolset=msvc-10.0 --build-type=complete --build-dir=%binpath%\%boost%Bin --link=shared --runtime-link=shared install
+       bjam.exe -j %NUMBER_OF_PROCESSORS% --prefix=%installpath%\%boost% --toolset=msvc-10.0 --build-type=complete --build-dir=%binpath%\%boost%Bin --link=shared --runtime-link=shared install >> %LogFolder%\boostInstall.log 2>&1
 ) else (
        if %PROCESSOR_ARCHITECTURE%==x86 (
-               bjam.exe -j %NUMBER_OF_PROCESSORS% --prefix=%installpath%\%boost% --toolset=msvc-10.0 --build-type=complete --build-dir=%binpath%\%boost%Bin --link=shared --runtime-link=shared install
+               bjam.exe -j %NUMBER_OF_PROCESSORS% --prefix=%installpath%\%boost% --toolset=msvc-10.0 --build-type=complete --build-dir=%binpath%\%boost%Bin --link=shared --runtime-link=shared install >> %LogFolder%\boostInstall.log 2>&1
        ) else (
-               bjam.exe -j %NUMBER_OF_PROCESSORS% --prefix=%installpath%\%boost% --toolset=msvc-10.0 architecture=x86 address-model=64 --build-type=complete --build-dir=%binpath%\%boost%Bin --link=shared --runtime-link=shared install
+               bjam.exe -j %NUMBER_OF_PROCESSORS% --prefix=%installpath%\%boost% --toolset=msvc-10.0 architecture=x86 address-model=64 --build-type=complete --build-dir=%binpath%\%boost%Bin --link=shared --runtime-link=shared install >> %LogFolder%\boostInstall.log 2>&1
        )
 )
 cd C:\
@@ -149,20 +150,20 @@ mkdir %vtk%Bin
 cd %vtk%Bin
 
 if %x86Comp%==ON (
-       cmake -G"Visual Studio 10"  -H%sourcepath%\%vtk% -B%binpath%\%vtk%Bin
+       cmake -G"Visual Studio 10"  -H%sourcepath%\%vtk% -B%binpath%\%vtk%Bin >> %LogFolder%\vtkInstall.log 2>&1
 ) else (
        if %PROCESSOR_ARCHITECTURE%==x86 (
-               cmake -G"Visual Studio 10"  -H%sourcepath%\%vtk% -B%binpath%\%vtk%Bin
+               cmake -G"Visual Studio 10"  -H%sourcepath%\%vtk% -B%binpath%\%vtk%Bin >> %LogFolder%\vtkInstall.log 2>&1
        ) else (
-               cmake -G"Visual Studio 10 Win64"  -H%sourcepath%\%vtk% -B%binpath%\%vtk%Bin 
+               cmake -G"Visual Studio 10 Win64"  -H%sourcepath%\%vtk% -B%binpath%\%vtk%Bin >> %LogFolder%\vtkInstall.log 2>&1
        )
 )
 
-cmake -D USE_DEBUG_LIB:BOOL=%buildType% -D CMAKE_INSTALL_PREFIX:PATH=%installpath%\%vtk%\ CMakeCache.txt
-cmake -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF -D BUILD_SHARED_LIBS:BOOL=ON -D VTK_USE_QT:BOOL=ON CMakeCache.txt
-cmake CMakeCache.txt
-FOR /R %%a IN (*.sln) DO msbuild %%a /m:%NUMBER_OF_PROCESSORS% /target:ALL_BUILD /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType%
-msbuild /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% INSTALL.vcxproj
+cmake -D USE_DEBUG_LIB:BOOL=%buildType% -D CMAKE_INSTALL_PREFIX:PATH=%installpath%\%vtk%\ CMakeCache.txt >> %LogFolder%\vtkInstall.log 2>&1
+cmake -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF -D BUILD_SHARED_LIBS:BOOL=ON -D VTK_USE_QT:BOOL=ON CMakeCache.txt >> %LogFolder%\vtkInstall.log 2>&1
+cmake CMakeCache.txt >> %LogFolder%\vtkInstall.log 2>&1
+FOR /R %%a IN (*.sln) DO msbuild %%a /m:%NUMBER_OF_PROCESSORS% /target:ALL_BUILD /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% >> %LogFolder%\vtkInstall.log 2>&1
+msbuild /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% INSTALL.vcxproj >> %LogFolder%\vtkInstall.log 2>&1
 
 cd c:\
 
@@ -177,20 +178,20 @@ mkdir %gdcm%Bin
 cd %gdcm%Bin
 
 if %x86Comp%==ON (
-       cmake -G"Visual Studio 10"  -H%sourcepath%\%gdcm% -B%binpath%\%gdcm%Bin
+       cmake -G"Visual Studio 10"  -H%sourcepath%\%gdcm% -B%binpath%\%gdcm%Bin >> %LogFolder%\GDCMInstall.log 2>&1
 ) else (
        if %PROCESSOR_ARCHITECTURE%==x86 (
-               cmake -G"Visual Studio 10"  -H%sourcepath%\%gdcm% -B%binpath%\%gdcm%Bin
+               cmake -G"Visual Studio 10"  -H%sourcepath%\%gdcm% -B%binpath%\%gdcm%Bin >> %LogFolder%\GDCMInstall.log 2>&1
        ) else (
-               cmake -G"Visual Studio 10 Win64"  -H%sourcepath%\%gdcm% -B%binpath%\%gdcm%Bin
+               cmake -G"Visual Studio 10 Win64"  -H%sourcepath%\%gdcm% -B%binpath%\%gdcm%Bin >> %LogFolder%\GDCMInstall.log 2>&1
        )
 )
 
-cmake -D USE_DEBUG_LIB:BOOL=%buildType% -D CMAKE_INSTALL_PREFIX:PATH=%installpath%\%gdcm%\ CMakeCache.txt
-cmake -D VTK_DIR:PATH=%binpath%\%vtk%Bin\ -D GDCM_VTK:BOOL=ON -D BUILD_TESTING:BOOL=OFF -D GDCM_NAME_SPACE:STRING=gdcm13 CMakeCache.txt
-cmake CMakeCache.txt
-FOR /R %%a IN (*.sln) DO msbuild %%a /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType%
-msbuild INSTALL.vcxproj /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType%
+cmake -D USE_DEBUG_LIB:BOOL=%buildType% -D CMAKE_INSTALL_PREFIX:PATH=%installpath%\%gdcm%\ CMakeCache.txt >> %LogFolder%\GDCMInstall.log 2>&1
+cmake -D VTK_DIR:PATH=%binpath%\%vtk%Bin\ -D GDCM_VTK:BOOL=ON -D BUILD_TESTING:BOOL=OFF -D GDCM_NAME_SPACE:STRING=gdcm13 CMakeCache.txt >> %LogFolder%\GDCMInstall.log 2>&1
+cmake CMakeCache.txt >> %LogFolder%\GDCMInstall.log 2>&1
+FOR /R %%a IN (*.sln) DO msbuild %%a /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% >> %LogFolder%\GDCMInstall.log 2>&1
+msbuild INSTALL.vcxproj /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% >> %LogFolder%\GDCMInstall.log 2>&1
 
 cd c:\
 
@@ -204,19 +205,19 @@ mkdir %itk%Bin
 cd %itk%Bin
 
 if %x86Comp%==ON (
-       cmake -G"Visual Studio 10" -H%sourcepath%\%itk% -B%binpath%\%itk%Bin
+       cmake -G"Visual Studio 10" -H%sourcepath%\%itk% -B%binpath%\%itk%Bin >> %LogFolder%\ITKInstall.log 2>&1
 ) else (
        if %PROCESSOR_ARCHITECTURE%==x86 (
-               cmake -G"Visual Studio 10" -H%sourcepath%\%itk% -B%binpath%\%itk%Bin
+               cmake -G"Visual Studio 10" -H%sourcepath%\%itk% -B%binpath%\%itk%Bin >> %LogFolder%\ITKInstall.log 2>&1
        ) else (
-               cmake -G"Visual Studio 10 Win64" -H%sourcepath%\%itk% -B%binpath%\%itk%Bin
+               cmake -G"Visual Studio 10 Win64" -H%sourcepath%\%itk% -B%binpath%\%itk%Bin >> %LogFolder%\ITKInstall.log 2>&1
        )
 )
-cmake -D USE_DEBUG_LIB:BOOL=%buildType% -D CMAKE_INSTALL_PREFIX:PATH=%installpath%\%itk%\ CMakeCache.txt
-cmake -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF -D BUILD_SHARED_LIBS:BOOL=ON -D ITK_USE_REVIEW:BOOL=ON CMakeCache.txt
-cmake CMakeCache.txt
-FOR /R %%a IN (*.sln) DO msbuild %%a /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType%
-msbuild INSTALL.vcxproj /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType%
+cmake -D USE_DEBUG_LIB:BOOL=%buildType% -D CMAKE_INSTALL_PREFIX:PATH=%installpath%\%itk%\ CMakeCache.txt >> %LogFolder%\ITKInstall.log 2>&1
+cmake -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF -D BUILD_SHARED_LIBS:BOOL=ON -D ITK_USE_REVIEW:BOOL=ON CMakeCache.txt >> %LogFolder%\ITKInstall.log 2>&1
+cmake CMakeCache.txt >> %LogFolder%\ITKInstall.log 2>&1
+FOR /R %%a IN (*.sln) DO msbuild %%a /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% >> %LogFolder%\ITKInstall.log 2>&1
+msbuild INSTALL.vcxproj /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% >> %LogFolder%\ITKInstall.log 2>&1
 
 cd c:\
 
@@ -224,36 +225,12 @@ echo -----------------------------------
 echo ------XERCES Installation----------
 echo -----------------------------------
 cd  %sourcepath%\%xercesc%\projects\Win32\VC10\xerces-all
-FOR /R %%a IN (*.sln) DO msbuild %%a /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType%
-FOR /R %%a IN (*.sln) DO msbuild %%a /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType%
-msbuild INSTALL.vcxproj /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType%
+FOR /R %%a IN (*.sln) DO msbuild %%a /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% >> %LogFolder%\XERCESInstall.log 2>&1
+FOR /R %%a IN (*.sln) DO msbuild %%a /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% >> %LogFolder%\XERCESInstall.log 2>&1
+msbuild INSTALL.vcxproj /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% >> %LogFolder%\XERCESInstall.log 2>&1
 
 echo -----------------------------------
 echo ---End of Installing Libraries-----
 echo -----------------------------------
-echo -----------------------------------
-echo -----------------------------------
-echo -----------------------------------
-echo -----------------------------------
-echo -----------------------------------
-echo -----------------------------------
-echo -----------------------------------
-echo -----------------------------------
-echo -----------------------------------
-echo -----------------------------------
-echo -----------------------------------
-echo -----------------------------------
-echo -----------------------------------
-echo -----------------------------------
-echo -----------------------------------
-echo -----------------------------------
-echo -----------------------------------
-echo -----------------------------------
-echo -----------------------------------
-echo -----------------------------------
-echo -----------------------------------
-echo -----------------------------------
-echo -----------------------------------
-echo -----------------------------------
 
-exit /B
\ No newline at end of file
+exit
\ No newline at end of file
index cb2116f1e74239b0c177cfaa1961a4882791f2c9..eec7edec13ca8aae9885e0736612f7029a9143aa 100644 (file)
@@ -66,6 +66,7 @@ if %x86Comp%==ON (
 cmake -D CMAKE_INSTALL_PREFIX:PATH=%installpath% CMakeCache.txt
 cmake -D CREA_LIBRARY_DLL_PATH:PATH=%thirdpartydllspath% CMakeCache.txt
 cmake CMakeCache.txt
+
 FOR /R %%a IN (*.sln) DO msbuild %%a /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType%
 msbuild /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% PACKAGE.vcxproj
 
index 0fc484cd5cdd597dd2a55337234eaa87fa7ffcea..b41c358917af198b8a86d25e2b0e5ee2ec46659a 100644 (file)
@@ -8,6 +8,8 @@ echo -----------------------------------
 
 set thirdpartyGeneration=%1
 set buildType=%2
+::The following line is to force x86 or x64 compilation
+set x86Comp=%3
 
 set installpath=%thirdpartyGeneration%\thirdparty_install\%buildType%
 set binpath=%thirdpartyGeneration%\thirdparty_bin\%buildType%
@@ -55,12 +57,17 @@ echo        set wxPrefixmsw=wxmsw293d
 echo )
 
 
-if %PROCESSOR_ARCHITECTURE%==x86  (
+if %x86Comp%==ON (
        set vcFolder=vc_dll
        set winType=Win32
 ) else (
-       set vcFolder=vc_amd64_dll
-       set winType=Win64
+       if %PROCESSOR_ARCHITECTURE%==x86  (
+               set vcFolder=vc_dll
+               set winType=Win32
+       ) else (
+               set vcFolder=vc_amd64_dll
+               set winType=Win64
+       )
 )
 
 echo -----------------------------------
@@ -105,6 +112,33 @@ copy /V /Y %QTDIR%\bin\QtTest%qtBtype%.dll %creaThirdPartydlls%
 copy /V /Y %QTDIR%\bin\QtXml%qtBtype%.dll %creaThirdPartydlls%
 copy /V /Y %QTDIR%\bin\QtXmlPatterns%qtBtype%.dll %creaThirdPartydlls%
 
+:: In order to compile I have to copy the following dlls -- change it because those libraries should be in dll folder of thirdparty libs
+copy /V /Y %QTDIR%\bin\assistant.exe %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\designer.exe %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\dumpcpp.exe %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\idc.exe %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\lconvert.exe %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\linguist.exe %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\lrelease.exe %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\lupdate.exe %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\moc.exe %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\pixeltool.exe %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\qcollectiongenerator.exe %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\qhelpconverter.exe %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\qhelpgenerator.exe %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\qmake.exe %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\qt3to4.exe %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\qtdemo.exe %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\rcc.exe %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\uic.exe %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\uic3.exe %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\xmlpatterns.exe %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\Qt3Support%qtBtype%.dll %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\QtCore%qtBtype%.dll %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\QtDesigner%qtBtype%.dll %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\QtDesignerComponents%qtBtype%.dll %creaThirdPartydlls%
+::End of temporal copy
+
 echo -----------------------------------
 echo -------------wxWidgets-------------
 echo -----------------------------------
index 8865a55a7d7c74f39c226ca46704a6d121303c03..edfabdc9ebe44257189be20c6eb98b920eba4c2c 100644 (file)
@@ -19,6 +19,8 @@ echo -----------------------------------
 
 set thirdpartyGeneration=%1
 set thirdpartyInstallPath=%2
+::The following line is to force x86 or x64 compilation
+set x86Comp=%3
 
 set MIKTEXPFDIR="%ProgramFilesPath_x86%\MiKTeX 2.9\miktex\bin\texworks.exe"
 
@@ -67,24 +69,29 @@ echo if(%buildType%==release)(
        set qtBtype=4
        set wxPrefixBase=wxbase28
        set wxPrefixmsw=wxmsw28
-       set boostMT=-vc100-mt-1_49.lib
-       set boostMTGD=-vc100-mt-gd-1_49.lib
-       set boostMTS=-vc100-mt-s-1_49.lib
-       set boostMTSGD=-vc100-mt-sgd-1_49.lib
+       set boostMT=-vc100-mt-1_49.*
+       set boostMTGD=-vc100-mt-gd-1_49.*
+       set boostMTS=-vc100-mt-s-1_49.*
+       set boostMTSGD=-vc100-mt-sgd-1_49.*
 echo ) else (
 echo   set qtBtype=d4
 echo   set wxPrefixBase=wxbase293d
 echo   set wxPrefixmsw=wxmsw293d
 echo )
 
-if %PROCESSOR_ARCHITECTURE%==x86  (
+if %x86Comp%==ON (
        set vcFolder=vc_dll
        set winType=Win32
 ) else (
-       set vcFolder=vc_amd64_dll
-       set winType=Win64
+       if %PROCESSOR_ARCHITECTURE%==x86  (
+               set vcFolder=vc_dll
+               set winType=Win32
+       ) else (
+               set vcFolder=vc_amd64_dll
+               set winType=Win64
+       )
 )
-
+       
 echo -----------------------------------
 echo Environment variables Configuration
 echo -----------------------------------
@@ -154,6 +161,21 @@ copy /V /Y %QTDIR%\bin\QtCore%qtBtype%.dll %creaThirdPartyLibraries%\%qt%\bin\
 copy /V /Y %QTDIR%\bin\QtDesigner%qtBtype%.dll %creaThirdPartyLibraries%\%qt%\bin\
 copy /V /Y %QTDIR%\bin\QtDesignerComponents%qtBtype%.dll %creaThirdPartyLibraries%\%qt%\bin\
 
+:: In order to compile I have to copy the following dlls -- change it because those libraries should be in dll folder of thirdparty libs
+copy /V /Y %QTDIR%\bin\phonon%qtBtype%.dll %creaThirdPartyLibraries%\%qt%\bin\
+copy /V /Y %QTDIR%\bin\QtCore%qtBtype%.dll %creaThirdPartyLibraries%\%qt%\bin\
+copy /V /Y %QTDIR%\bin\QtGui%qtBtype%.dll %creaThirdPartyLibraries%\%qt%\bin\
+copy /V /Y %QTDIR%\bin\QtNetwork%qtBtype%.dll %creaThirdPartyLibraries%\%qt%\bin\
+copy /V /Y %QTDIR%\bin\QtOpenGL%qtBtype%.dll %creaThirdPartyLibraries%\%qt%\bin\
+copy /V /Y %QTDIR%\bin\QtScript%qtBtype%.dll %creaThirdPartyLibraries%\%qt%\bin\
+copy /V /Y %QTDIR%\bin\QtScriptTools%qtBtype%.dll %creaThirdPartyLibraries%\%qt%\bin\
+copy /V /Y %QTDIR%\bin\QtSql%qtBtype%.dll %creaThirdPartyLibraries%\%qt%\bin\
+copy /V /Y %QTDIR%\bin\QtSvg%qtBtype%.dll %creaThirdPartyLibraries%\%qt%\bin\
+copy /V /Y %QTDIR%\bin\QtTest%qtBtype%.dll %creaThirdPartyLibraries%\%qt%\bin\
+copy /V /Y %QTDIR%\bin\QtXml%qtBtype%.dll %creaThirdPartyLibraries%\%qt%\bin\
+copy /V /Y %QTDIR%\bin\QtXmlPatterns%qtBtype%.dll %creaThirdPartyLibraries%\%qt%\bin\
+::End of temporal copy
+
 XCOPY %QTDIR%\lib\*.lib %creaThirdPartyLibraries%\%qt%\lib\ /i
 
 mkdir %creaThirdPartyLibraries%\%qt%\src\corelib
@@ -186,6 +208,21 @@ copy /V /Y %WXDIR%\lib\vms_gtk.opt %creaThirdPartyLibraries%\%wxWidgets%\lib\
 
 mkdir %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
 
+:: In order to compile I have to copy the following dlls -- change it because those libraries should be in dll folder of thirdparty libs
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixBase%_net_vc_custom.dll %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixBase%_vc_custom.dll %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixBase%_xml_vc_custom.dll %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_adv_vc_custom.dll %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_aui_vc_custom.dll %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_core_vc_custom.dll %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_gl_vc_custom.dll %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_html_vc_custom.dll %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_media_vc_custom.dll %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_qa_vc_custom.dll %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_richtext_vc_custom.dll %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_xrc_vc_custom.dll %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+::End of temporal copy
+
 copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixBase%.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
 copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixBase%_net.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
 copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixBase%_xml.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
@@ -331,6 +368,9 @@ XCOPY %XERCESDIR%\src\* %creaThirdPartyLibraries%\%xercesc%\include\ /s /i
 
 copy /V /Y %XERCESDIR%\Build\%winType%\VC10\Release\xerces-c_3.lib %creaThirdPartyLibraries%\%xercesc%\lib\
 
+:: In order to compile I have to copy the following dlls -- change it because those libraries should be in dll folder of thirdparty libs
+copy /V /Y %XERCESDIR%\Build\%winType%\VC10\Release\xerces-c_3_1.dll %creaThirdPartyLibraries%\%xercesc%\lib\
+
 
 echo -----------------------------------
 echo -------------ITK-------------------
@@ -377,12 +417,12 @@ echo -----------------------------------
 mkdir %creaThirdPartyLibraries%\tth
 XCOPY %TTHDIR%\* %creaThirdPartyLibraries%\%tth% /s /i
 
-echo -----------------------------------
-echo -------------MiKText---------------
-echo -----------------------------------
-mkdir %creaThirdPartyLibraries%\%miktexAux%
+::echo -----------------------------------
+::echo -------------MiKText---------------
+::echo -----------------------------------
+::mkdir %creaThirdPartyLibraries%\%miktexAux%
 
-XCOPY %MIKTEXPFDIR%\* %MIKTEXDIR% /s /i
+::XCOPY %MIKTEXPFDIR%\* %MIKTEXDIR% /s /i
 
 
 echo -----------------------------------