8000 Switch windows release build to 'RelWithDebug' · msand/arangodb@dd1a73c · GitHub
[go: up one dir, main page]
Skip to content

Commit dd1a73c

Browse files
dothebartdothebart
committed
Switch windows release build to 'RelWithDebug'
1 parent 32a268c commit dd1a73c

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

‎3rdParty/Makefile.v8-windows

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ install_bits:
4545
cp $$i $(V8)/build/$${BUILD}/lib/$${LIBNAME}.pdb; \
4646
done
4747

48-
cp -a $(V8)/build/Release$(BITS)/lib/*.lib ../WindowsLibraries/$(BITS)/lib/Release
49-
cp -a $(V8)/build/Release$(BITS)/lib/*.pdb ../WindowsLibraries/$(BITS)/lib/Release
48+
cp -a $(V8)/build/Release$(BITS)/lib/*.lib ../WindowsLibraries/$(BITS)/lib/RelWithDebInfo
49+
cp -a $(V8)/build/Release$(BITS)/lib/*.pdb ../WindowsLibraries/$(BITS)/lib/RelWithDebInfo
5050
cp -a $(V8)/build/Debug$(BITS)/lib/*.lib ../WindowsLibraries/$(BITS)/lib/Debug
5151
cp -a $(V8)/build/Debug$(BITS)/lib/*.pdb ../WindowsLibraries/$(BITS)/lib/Debug
5252
cp -a $(V8)/include/* ../WindowsLibraries/$(BITS)/include

‎GNUmakefile

Lines changed: 8 additions & 3 deletions
< 7B0A td data-grid-cell-id="diff-e3445fc75aa9c3e4a60fbe5394dcce12693022018216a8fbe0000fe9952850a6-331-334-2" data-line-anchor="diff-e3445fc75aa9c3e4a60fbe5394dcce12693022018216a8fbe0000fe9952850a6R334" data-selected="false" role="gridcell" style="background-color:var(--bgColor-default);padding-right:24px" tabindex="-1" valign="top" class="focusable-grid-cell diff-text-cell right-side-diff-cell left-side">
-D "CPACK_PACKAGE_VERSION_MINOR=${VERSION_MINOR}" \
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ MAINTAINER = \
4242
lib/V8/v8-json.cpp \
4343
lib/Basics/voc-errors.h \
4444
lib/Basics/voc-errors.cpp \
45-
js/common/bootstrap/errors.js
45+
js/common/bootstrap/errors.js \
46+
mr/common/bootstrap/mr-error.h
4647

4748
AUTOMAGIC = \
4849
Makefile.in \
@@ -313,7 +314,7 @@ pack-winXX:
313314
rm -rf Build$(BITS) && mkdir Build$(BITS)
314315

315316
${MAKE} winXX-cmake BITS="$(BITS)" TARGET="$(TARGET)" VERSION="`awk '{print substr($$3,2,length($$3)-2);}' build.h`"
316-
${MAKE} winXX-build BITS="$(BITS)" TARGET="$(TARGET)" BUILD_TARGET=Release
317+
${MAKE} winXX-build BITS="$(BITS)" TARGET="$(TARGET)" BUILD_TARGET=RelWithDebInfo
317318
${MAKE} packXX BITS="$(BITS)"
318319

319320
pack-winXX-MOREOPTS:
@@ -327,6 +328,8 @@ winXX-cmake: checkcmake
327328
cd Build$(BITS) && cmake \
328329
-G "$(TARGET)" \
329330
-D "ARANGODB_VERSION=${VERSION}" \
331+
-D "CMAKE_BUILD_TYPE=RelWithDebInfo" \
332+
-D "BUILD_TYPE=RelWithDebInfo" \
330333
-D "CPACK_PACKAGE_VERSION_MAJOR=${VERSION_MAJOR}" \
331334
332335
-D "CPACK_PACKAGE_VERSION_PATCH=${VERSION_PATCH}" \
@@ -342,7 +345,9 @@ winXX-build:
342345
packXX:
343346
./Installation/file-copy-js.sh . Build$(BITS)
344347

345-
cd Build$(BITS) && cpack -G NSIS && cpack -G ZIP
348+
cd Build$(BITS) && cp -a bin/RelWithDebInfo bin/Release
349+
cd Build$(BITS) && cpack -G NSIS -D "BUILD_TYPE=RelWithDebInfo"
350+
cd Build$(BITS) && cpack -G ZIP -D "BUILD_TARGET=RelWithDebInfo"
346351

347352
./Installation/Windows/installer-generator.sh $(BITS) $(shell pwd)
348353

0 commit comments

Comments
 (0)
0