Skip to content

Commit

Permalink
Remove obsolete installation stuff..
Browse files Browse the repository at this point in the history
Windows install is now as simple as cpack -G NSIS64 .
click click
  • Loading branch information
Andreas Streichardt committed Jul 8, 2016
1 parent 8c4f178 commit f294f11
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 75 deletions.
20 changes: 1 addition & 19 deletions GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -155,11 +155,6 @@ pack-macosx-cmake:

test -d bin || mkdir bin

rm -f ./.file-list-js
cd Build && ${MAKE}

./Installation/file-copy-js.sh . Build

cd Build && ${MAKE} install DESTDIR=${PACK_DESTDIR}

################################################################################
Expand All @@ -186,11 +181,6 @@ pack-arm-cmake:

${MAKE} ${BUILT_SOURCES}

rm -f ./.file-list-js
cd Build && ${MAKE}

./Installation/file-copy-js.sh . Build

cd Build && cpack -G DEB


Expand All @@ -207,11 +197,8 @@ pack-deb-cmake:

${MAKE} ${BUILT_SOURCES}

rm -f ./.file-list-js
cd Build && ${MAKE}

./Installation/file-copy-js.sh . Build

cd Build && cpack -G DEB

################################################################################
Expand Down Expand Up @@ -255,7 +242,6 @@ pack-winXX-MOREOPTS:
${MAKE} packXX BITS="$(BITS)" TARGET="$(TARGET)" BUILD_TARGET=Debug

winXX-cmake:
rm -f ./.file-list-js
cd ../b && cmake \
-G "$(TARGET)" \
-D "CMAKE_BUILD_TYPE=RelWithDebInfo" \
Expand All @@ -269,9 +255,5 @@ winXX-build:
cd ../b && cmake --build . --config $(BUILD_TARGET)

packXX:
if test ! -d ../b/js; then ./Installation/file-copy-js.sh . ../b; fi
cd ../b; rm -f ArangoDB-*.exe ArangoDB*.nsi
cd ../b && cpack -G NSIS -C $(BUILD_TARGET)
cd ../b && cpack -G NSIS64 -C $(BUILD_TARGET)
cd ../b && cpack -G ZIP -C $(BUILD_TARGET)

./Installation/Windows/installer-generator.sh $(BITS) ..\\b
1 change: 0 additions & 1 deletion Installation/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ build-stamp:
# not used
rm -rf js/node/node_modules/js-yaml/demo

rm -f .file-list-js
make -j12 all

# --- end custom part for compiling
Expand Down
20 changes: 0 additions & 20 deletions Installation/file-copy-js.sh

This file was deleted.

35 changes: 0 additions & 35 deletions Installation/file-list-js.sh

This file was deleted.

0 comments on commit f294f11

Please sign in to comment.