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

Merge branch 'devel' of https://github.com/arangodb/arangodb into devel

This commit is contained in:
Jan Steemann 2015-07-16 20:25:13 +02:00
parent efb68a2e6c e45947cefd
commit b1a38a09df
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,8 +45,8 @@ install_bits:
cp $$i $(V8)/build/$${BUILD}/lib/$${LIBNAME}.pdb; \ cp $$i $(V8)/build/$${BUILD}/lib/$${LIBNAME}.pdb; \
done done
cp -a $(V8)/build/Release$(BITS)/lib/*.lib ../WindowsLibraries/$(BITS)/lib/Release cp -a $(V8)/build/Release$(BITS)/lib/*.lib ../WindowsLibraries/$(BITS)/lib/RelWithDebInfo
cp -a $(V8)/build/Release$(BITS)/lib/*.pdb ../WindowsLibraries/$(BITS)/lib/Release cp -a $(V8)/build/Release$(BITS)/lib/*.pdb ../WindowsLibraries/$(BITS)/lib/RelWithDebInfo
cp -a $(V8)/build/Debug$(BITS)/lib/*.lib ../WindowsLibraries/$(BITS)/lib/Debug cp -a $(V8)/build/Debug$(BITS)/lib/*.lib ../WindowsLibraries/$(BITS)/lib/Debug
cp -a $(V8)/build/Debug$(BITS)/lib/*.pdb ../WindowsLibraries/$(BITS)/lib/Debug cp -a $(V8)/build/Debug$(BITS)/lib/*.pdb ../WindowsLibraries/$(BITS)/lib/Debug
cp -a $(V8)/include/* ../WindowsLibraries/$(BITS)/include cp -a $(V8)/include/* ../WindowsLibraries/$(BITS)/include

11
GNUmakefile
View File

@ -42,7 +42,8 @@ MAINTAINER = \
lib/V8/v8-json.cpp \ lib/V8/v8-json.cpp \
lib/Basics/voc-errors.h \ lib/Basics/voc-errors.h \
lib/Basics/voc-errors.cpp \ lib/Basics/voc-errors.cpp \
js/common/bootstrap/errors.js js/common/bootstrap/errors.js \
mr/common/bootstrap/mr-error.h
AUTOMAGIC = \ AUTOMAGIC = \
Makefile.in \ Makefile.in \
@ -313,7 +314,7 @@ pack-winXX:
rm -rf Build$(BITS) && mkdir Build$(BITS) rm -rf Build$(BITS) && mkdir Build$(BITS)
${MAKE} winXX-cmake BITS="$(BITS)" TARGET="$(TARGET)" VERSION="`awk '{print substr($$3,2,length($$3)-2);}' build.h`" ${MAKE} winXX-cmake BITS="$(BITS)" TARGET="$(TARGET)" VERSION="`awk '{print substr($$3,2,length($$3)-2);}' build.h`"
${MAKE} winXX-build BITS="$(BITS)" TARGET="$(TARGET)" BUILD_TARGET=Release ${MAKE} winXX-build BITS="$(BITS)" TARGET="$(TARGET)" BUILD_TARGET=RelWithDebInfo
${MAKE} packXX BITS="$(BITS)" ${MAKE} packXX BITS="$(BITS)"
pack-winXX-MOREOPTS: pack-winXX-MOREOPTS:
@ -327,6 +328,8 @@ winXX-cmake: checkcmake
cd Build$(BITS) && cmake \ cd Build$(BITS) && cmake \
-G "$(TARGET)" \ -G "$(TARGET)" \
-D "ARANGODB_VERSION=${VERSION}" \ -D "ARANGODB_VERSION=${VERSION}" \
-D "CMAKE_BUILD_TYPE=RelWithDebInfo" \
-D "BUILD_TYPE=RelWithDebInfo" \
-D "CPACK_PACKAGE_VERSION_MAJOR=${VERSION_MAJOR}" \ -D "CPACK_PACKAGE_VERSION_MAJOR=${VERSION_MAJOR}" \
-D "CPACK_PACKAGE_VERSION_MINOR=${VERSION_MINOR}" \ -D "CPACK_PACKAGE_VERSION_MINOR=${VERSION_MINOR}" \
-D "CPACK_PACKAGE_VERSION_PATCH=${VERSION_PATCH}" \ -D "CPACK_PACKAGE_VERSION_PATCH=${VERSION_PATCH}" \
@ -342,7 +345,9 @@ winXX-build:
packXX: packXX:
./Installation/file-copy-js.sh . Build$(BITS) ./Installation/file-copy-js.sh . Build$(BITS)
cd Build$(BITS) && cpack -G NSIS && cpack -G ZIP cd Build$(BITS) && cp -a bin/RelWithDebInfo bin/Release
cd Build$(BITS) && cpack -G NSIS -D "BUILD_TYPE=RelWithDebInfo"
cd Build$(BITS) && cpack -G ZIP -D "BUILD_TARGET=RelWithDebInfo"
./Installation/Windows/installer-generator.sh $(BITS) $(shell pwd) ./Installation/Windows/installer-generator.sh $(BITS) $(shell pwd)