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

Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel

This commit is contained in:
Max Neunhoeffer 2016-05-25 17:29:02 +02:00
parent 4a4472e31e 96241693bf
commit e3bfe6ec76
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
GNUmakefile
View File

@ -4,6 +4,8 @@
## --SECTION-- COMMON VARIABLES ## --SECTION-- COMMON VARIABLES
## ----------------------------------------------------------------------------- ## -----------------------------------------------------------------------------
SRC=$(shell pwd |sed "s;.*/;;")
.PHONY: warning help .PHONY: warning help
warning: warning:
@ -245,14 +247,14 @@ win64-relative-debug:
$(MAKE) winXX-build BITS=64 BUILD_TARGET=Debug $(MAKE) winXX-build BITS=64 BUILD_TARGET=Debug
pack-winXX: pack-winXX:
rm -rf Build$(BITS) && mkdir Build$(BITS) rm -rf ../b && mkdir ../b
${MAKE} winXX-cmake BITS="$(BITS)" TARGET="$(TARGET)" ${MAKE} winXX-cmake BITS="$(BITS)" TARGET="$(TARGET)"
${MAKE} winXX-build BITS="$(BITS)" TARGET="$(TARGET)" BUILD_TARGET=RelWithDebInfo ${MAKE} winXX-build BITS="$(BITS)" TARGET="$(TARGET)" BUILD_TARGET=RelWithDebInfo
${MAKE} packXX BITS="$(BITS)" ${MAKE} packXX BITS="$(BITS)"
pack-winXX-MOREOPTS: pack-winXX-MOREOPTS:
rm -rf Build$(BITS) && mkdir Build$(BITS) rm -rf ../b && mkdir ../b
${MAKE} winXX-cmake BITS="$(BITS)" TARGET="$(TARGET)" MOREOPTS=$(MOREOPTS) ${MAKE} winXX-cmake BITS="$(BITS)" TARGET="$(TARGET)" MOREOPTS=$(MOREOPTS)
${MAKE} winXX-build BITS="$(BITS)" TARGET="$(TARGET)" BUILD_TARGET=Debug ${MAKE} winXX-build BITS="$(BITS)" TARGET="$(TARGET)" BUILD_TARGET=Debug
@ -260,22 +262,22 @@ pack-winXX-MOREOPTS:
winXX-cmake: winXX-cmake:
rm -f ./.file-list-js rm -f ./.file-list-js
cd Build$(BITS) && cmake \ cd ../b && cmake \
-G "$(TARGET)" \ -G "$(TARGET)" \
-D "CMAKE_BUILD_TYPE=RelWithDebInfo" \ -D "CMAKE_BUILD_TYPE=RelWithDebInfo" \
-D "BUILD_TYPE=RelWithDebInfo" \ -D "BUILD_TYPE=RelWithDebInfo" \
-D "BUILD_ID=${BUILD_ID}" \ -D "BUILD_ID=${BUILD_ID}" \
$(MOREOPTS) \ $(MOREOPTS) \
.. ../$(SRC)/
winXX-build: winXX-build:
cp Installation/Windows/Icons/arangodb.ico Build$(BITS) cp Installation/Windows/Icons/arangodb.ico ../b
cd Build$(BITS) && cmake --build . --config $(BUILD_TARGET) cd ../b && cmake --build . --config $(BUILD_TARGET)
packXX: packXX:
./Installation/file-copy-js.sh . Build$(BITS) ./Installation/file-copy-js.sh . ../b
cd ../b && find -name cmake_install.cmake -exec sed -i {} -e "s;(Configuration);{CMAKE_INSTALL_CONFIG_NAME};" \;
cd ../b && cpack -G NSIS -C $(BUILD_TARGET)
cd ../b && cpack -G ZIP -C $(BUILD_TARGET)
cd Build$(BITS) && cpack -G NSIS -C $(BUILD_TARGET) ./Installation/Windows/installer-generator.sh $(BITS) ..\\b
cd Build$(BITS) && cpack -G ZIP -C $(BUILD_TARGET)
./Installation/Windows/installer-generator.sh $(BITS) $(shell pwd)