[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61388] trunk/lib/win64_vc12/llvm: Update buildscript to llvm 3.4.2.

[Martijn Berger]

Revision: 61388
          https://developer.blender.org/rBL61388
Author:   juicyfruit
Date:     2014-07-31 13:43:26 +0000 (Thu, 31 Jul 2014)
Log Message:
-----------
Update buildscript to llvm 3.4.2. Switch to msbuild from nmake for building.

Modified Paths:
--------------
    trunk/lib/win64_vc12/llvm/build.bat
    trunk/lib/win64_vc12/llvm/readme.txt

Modified: trunk/lib/win64_vc12/llvm/build.bat
===================================================================
--- trunk/lib/win64_vc12/llvm/build.bat	2014-07-25 09:28:24 UTC (rev 61387)
+++ trunk/lib/win64_vc12/llvm/build.bat	2014-07-31 13:43:26 UTC (rev 61388)
@@ -1,9 +1,20 @@
- at Echo off
+:: @Echo off
 
-set LIBDIR=%CD%\..\..
+setlocal
 
-call :Build
+set LIBDIR=%CD%\..
 
+set LLVM_VERSION=3.4.2
+set LLVM_SOURCE=http://llvm.org/releases/%LLVM_VERSION%/llvm-%LLVM_VERSION%.src.tar.gz
+set CLANG_SOURCE=http://llvm.org/releases/%LLVM_VERSION%/cfe-%LLVM_VERSION%.src.tar.gz
+
+
+
+call :PrepareSource
+
+
+call :Build_debug
+
 cd %LIBDIR%\llvm
 
 exit /b
@@ -10,42 +21,72 @@
 
 :Build
 
-cd llvm-3.2.src
+cd llvm-%LLVM_VERSION%.src
 :: create build directory
 mkdir build\windows
 cd build\windows
 
-cmake -G "NMake Makefiles" ..\.. ^
+cmake -G "Visual Studio 12 2013 Win64" ..\.. ^
  -DCMAKE_INSTALL_PREFIX=%LIBDIR%\llvm ^
  -DCMAKE_BUILD_TYPE=Release ^
  -DLLVM_USE_CRT_RELEASE=MT ^
  -DLLVM_INCLUDE_TESTS=OFF ^
- -DPYTHON_EXECUTABLE="c:\Python-2.7\python.exe" ^
+ -DLLVM_TARGETS_TO_BUILD="X86" ^
  -DLLVM_INCLUDE_EXAMPLES=OFF
 
-nmake
-nmake install
-nmake clean
+exit /b
 
+msbuild /p:Configuration=Release /t:Rebuild  /p:Platform="x64" llvm.sln
+msbuild /p:Configuration=Release /t:Build  /p:Platform="x64" INSTALL.vcxproj
 goto:eof
 
 
 :Build_debug
-cd llvm-3.2.src
+cd llvm-%LLVM_VERSION%.src
 
 :: create build directory
 mkdir build\windows_debug
 cd build\windows_debug
 
-cmake -G "NMake Makefiles" ..\.. ^
+cmake -G ""Visual Studio 12 2013 Win64" ..\.. ^
  -DCMAKE_INSTALL_PREFIX=%LIBDIR%\llvm\debug ^
  -DCMAKE_BUILD_TYPE=Debug ^
  -DLLVM_USE_CRT_DEBUG=MTd ^
  -DLLVM_INCLUDE_TESTS=OFF ^
- -DPYTHON_EXECUTABLE="c:\Python33\python.exe" ^
+ -DLLVM_TARGETS_TO_BUILD="X86" ^
  -DLLVM_INCLUDE_EXAMPLES=OFF
 
-nmake install
+msbuild /p:Configuration=Debug /t:Rebuild  /p:Platform="x64" llvm.sln
+msbuild /p:Configuration=Release /t:Build  /p:Platform="x64" INSTALL.vcxproj
 goto:eof
 
 
+:PrepareSource
+
+if not exist llvm-%LLVM_VERSION%.src.tar.gz (
+    echo Downloading llvm %LLVM_VERSION%
+    curl -L "%LLVM_SOURCE%" -o llvm-%LLVM_VERSION%.src.tar.gz
+)
+
+if not exist cfe-%LLVM_VERSION%.src.tar.gz (
+    echo Downloading clang %LLVM_VERSION%
+    curl -L "%CLANG_SOURCE%" -o cfe-%LLVM_VERSION%.src.tar.gz
+)
+
+if not exist llvm-%LLVM_VERSION%.src (
+
+
+    echo Extraction source to llvm %LLVM_VERSION%
+    tar xf llvm-%LLVM_VERSION%.src.tar.gz
+	
+	echo Extraction source to clang %LLVM_VERSION%
+    tar xf cfe-%LLVM_VERSION%.src.tar.gz
+	)
+	
+	:: Probably not as you should do it but this works
+	move cfe-%LLVM_VERSION%.src llvm-%LLVM_VERSION%.src\tools\clang
+)
+
+
+
+goto:eof
\ No newline at end of file

Modified: trunk/lib/win64_vc12/llvm/readme.txt
===================================================================
--- trunk/lib/win64_vc12/llvm/readme.txt	2014-07-25 09:28:24 UTC (rev 61387)
+++ trunk/lib/win64_vc12/llvm/readme.txt	2014-07-31 13:43:26 UTC (rev 61388)
@@ -1,10 +1,8 @@
 
-Build Info
+Build Info for llvm 3.4.2 / clang 3.4.2
 
-* Download LLVM and Clang 3.2 source code
-* Extract llvm in lib/windows/llvm/llvm-3.2.src
-* Extract clang in lib/windows/llvm/llvm-3.2.src/tools/clang
 * Open Visual Studio 2013 x64 Command Prompt
+* script expects curl and python in path
 * cd into lib/win64_vc/llvm
 * build.bat