Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

merge

This commit is contained in:
hkernbach 2015-08-24 14:52:40 +02:00
parent 0d154ea124 65cd1b68f3
commit e00a0e6971
4 changed files with 41 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
3rdParty/Makefile.v8-windows vendored
View File

@ -1,5 +1,7 @@
PDBNAME=vc120.pdb PDBNAME=vc120.pdb
TARGET=Visual Studio 12
VS=2013
VSPATH="C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC"
V8=V8-4.3.61 V8=V8-4.3.61
.PHONY: all install .PHONY: all install
@ -8,28 +10,28 @@ all: build64 build32
build64: build64:
./v8-build.bat x86_amd64 x64 x64 64 ./v8-build.bat x86_amd64 x64 x64 64 $(VS) "$(VSPATH)" $(V8)
build32: build32:
./v8-build.bat x86 ia32 Win32 32 ./v8-build.bat x86 ia32 Win32 32 $(VS) "$(VSPATH)" $(V8)
clean: clean32 clean64 clean: clean32 clean64
clean64: clean64:
./v8-clean.bat cmd x86_amd64 x64 x64 64 ./v8-clean.bat cmd x86_amd64 x64 x64 64 $(VS) "$(VSPATH)" $(V8)
clean32: clean32:
./v8-clean.bat x86 ia32 Win32 32 32 ./v8-clean.bat x86 ia32 Win32 32 32 $(VS) "$(VSPATH)" $(V8)
distclean: distclean32 distclean64 distclean: distclean32 distclean64
distclean64: distclean64:
./v8-distclean.bat x86_amd64 x64 x64 64 ./v8-distclean.bat x86_amd64 x64 x64 64 $(VS) "$(VSPATH)" $(V8)
distclean32: distclean32:
./v8-distclean.bat x86 ia32 Win32 32 ./v8-distclean.bat x86 ia32 Win32 32 $(VS) "$(VSPATH)" $(V8)
install: install:

30
3rdParty/v8-build.bat vendored
View File

@ -2,17 +2,6 @@
:: ==== <CONFIGURATION> :: ==== <CONFIGURATION>
:: ======================================================================================================== :: ========================================================================================================
:: Set the version of Visual Studio. This will just add a suffix to the string
:: of your directories to avoid mixing them up.
SET VS_VERSION=vs2013
:: Set this to the directory that contains vcvarsall.bat file of the
:: VC Visual Studio version you want to use for building ICU.
SET VISUAL_STUDIO_VC="C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC"
:: Set this to the version of ICU you are building
SET V8_VERSION=4.3.61
:: x86_amd64 or x86 :: x86_amd64 or x86
set ARCHITECTURE=%1 set ARCHITECTURE=%1
@ -25,13 +14,26 @@ set MSPLATFORM=%3
:: 64 or 32 :: 64 or 32
set SUFFIX=%4 set SUFFIX=%4
:: Set the version of Visual Studio. This will just add a suffix to the string
:: of your directories to avoid mixing them up.
SET VS_VERSION=vs%5
SET MSVS_VERSION=%5
:: Set this to the directory that contains vcvarsall.bat file of the
:: VC Visual Studio version you want to use for building ICU.
SET VISUAL_STUDIO_VC=%6
:: Set this to the version of V8 you are building
SET V8_VERSION=%7
:: ======================================================================================================== :: ========================================================================================================
:: ==== <BUILD> :: ==== <BUILD>
:: ======================================================================================================== :: ========================================================================================================
call %VISUAL_STUDIO_VC%\vcvarsall.bat %ARCHITECTURE% call %VISUAL_STUDIO_VC%\vcvarsall.bat %ARCHITECTURE%
set CMD=-G msvs_version=2013 set CMD=-G msvs_version=%MSVS_VERSION%
set CMD=%CMD% -Dtarget_arch=%PLATFORM% set CMD=%CMD% -Dtarget_arch=%PLATFORM%
set CMD=%CMD% -Dcomponent=static_library set CMD=%CMD% -Dcomponent=static_library
set CMD=%CMD% -Dmode=release set CMD=%CMD% -Dmode=release
@ -40,9 +42,9 @@ set CMD=%CMD% -Dv8_use_snapshot=false
echo %CMD% echo %CMD%
cd V8-%V8_VERSION% cd %V8_VERSION%
set PATH=%~dp0V8-%V8_VERSION%\third_party\python_26;%PATH% set PATH=%~dp0%V8_VERSION%\third_party\python_26;%PATH%
.\third_party\python_26\python.exe build\gyp_v8 %CMD% .\third_party\python_26\python.exe build\gyp_v8 %CMD%
cd build cd build

8
3rdParty/v8-clean.bat vendored
View File

@ -4,14 +4,14 @@
:: Set the version of Visual Studio. This will just add a suffix to the string :: Set the version of Visual Studio. This will just add a suffix to the string
:: of your directories to avoid mixing them up. :: of your directories to avoid mixing them up.
SET VS_VERSION=vs2013 SET VS_VERSION=vs%5
:: Set this to the directory that contains vcvarsall.bat file of the :: Set this to the directory that contains vcvarsall.bat file of the
:: VC Visual Studio version you want to use for building ICU. :: VC Visual Studio version you want to use for building ICU.
SET VISUAL_STUDIO_VC="C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC" SET VISUAL_STUDIO_VC=%6
:: Set this to the version of ICU you are building :: Set this to the version of ICU you are building
SET V8_VERSION=4.3.61 SET V8_VERSION=%7
:: x86_amd64 or x86 :: x86_amd64 or x86
set ARCHITECTURE=%1 set ARCHITECTURE=%1
@ -29,7 +29,7 @@ set SUFFIX=%4
:: ==== <CLEAN> :: ==== <CLEAN>
:: ======================================================================================================== :: ========================================================================================================
cd V8-%V8_VERSION% cd %V8_VERSION%
cd build cd build
rmdir /S /Q Debug rmdir /S /Q Debug

24
3rdParty/v8-distclean.bat vendored
View File

@ -2,17 +2,6 @@
:: ==== <CONFIGURATION> :: ==== <CONFIGURATION>
:: ======================================================================================================== :: ========================================================================================================
:: Set the version of Visual Studio. This will just add a suffix to the string
:: of your directories to avoid mixing them up.
SET VS_VERSION=vs2013
:: Set this to the directory that contains vcvarsall.bat file of the
:: VC Visual Studio version you want to use for building ICU.
SET VISUAL_STUDIO_VC="C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC"
:: Set this to the version of ICU you are building
SET V8_VERSION=4.3.61
:: x86_amd64 or x86 :: x86_amd64 or x86
set ARCHITECTURE=%1 set ARCHITECTURE=%1
@ -25,11 +14,22 @@ set MSPLATFORM=%3
:: 64 or 32 :: 64 or 32
set SUFFIX=%4 set SUFFIX=%4
:: Set the version of Visual Studio. This will just add a suffix to the string
:: of your directories to avoid mixing them up.
SET VS_VERSION=vs%5
:: Set this to the directory that contains vcvarsall.bat file of the
:: VC Visual Studio version you want to use for building ICU.
SET VISUAL_STUDIO_VC=%6
:: Set this to the version of V8 you are building
SET V8_VERSION=%7
:: ======================================================================================================== :: ========================================================================================================
:: ==== <DISTCLEAN> :: ==== <DISTCLEAN>
:: ======================================================================================================== :: ========================================================================================================
cd V8-%V8_VERSION% cd %V8_VERSION%
del /f /q "build\all.sln" del /f /q "build\all.sln"
del /f /q "build\all.vcxproj" del /f /q "build\all.vcxproj"