Keep "build" directory naming

jdmcgee · Jul 18, 2019 · 1f9ffc9 · 1f9ffc9
1 parent 4603d65
commit 1f9ffc9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/bin/create_all_releases.sh b/bin/create_all_releases.sh
@@ -10,12 +10,12 @@ make_release()
 	PLATFORM=$2
 	shift 2
 
-	rm -r hyperion.ng-${RELEASE}
-	mkdir -p hyperion.ng-${RELEASE}
+	rm -r build-${RELEASE}
+	mkdir -p build-${RELEASE}
 	rm -r deploy/${RELEASE}
 	mkdir -p deploy/${RELEASE}
 
-	cd  hyperion.ng-${RELEASE}
+	cd  build-${RELEASE}
 	cmake -DCMAKE_INSTALL_PREFIX=/usr -DPLATFORM=${PLATFORM} $@ -DCMAKE_BUILD_TYPE=Release -Wno-dev .. || exit 1
 	make -j $(nproc)  || exit 1
 	#strip bin/*
@@ -25,8 +25,8 @@ make_release()
 	bin/create_release.sh . ${RELEASE}
 }
 
-CMAKE_PROTOC_FLAG="-DIMPORT_PROTOC=../hyperion.ng-x86x64/protoc_export.cmake"
-CMAKE_FLATC_FLAG="-DIMPORT_FLATC=../hyperion.ng-x86x64/flatc_export.cmake"
+CMAKE_PROTOC_FLAG="-DIMPORT_PROTOC=../build-x86x64/protoc_export.cmake"
+CMAKE_FLATC_FLAG="-DIMPORT_FLATC=../build-x86x64/flatc_export.cmake"
 
 make_release x86x64  x86
 #make_release x32     x86   -DCMAKE_TOOLCHAIN_FILE="../cmake/Toolchain-x32.cmake" ${CMAKE_PROTOC_FLAG} ${CMAKE_FLATC_FLAG}

diff --git a/bin/create_release.sh b/bin/create_release.sh
@@ -7,7 +7,7 @@ fi
 
 repodir="$1"
 buildid="$2"
-builddir=$repodir/hyperion.ng-$buildid
+builddir=$repodir/build-$buildid
 echo build directory = $builddir
 echo repository root directory = $repodir
 if ! [ -d "$builddir" ]; then