mirror of
				https://github.com/hyperion-project/hyperion.ng.git
				synced 2025-03-01 10:33:28 +00:00 
			
		
		
		
	Correct Copy Process
because the package names have changed (have the scripts in line with docker-compile.sh)
This commit is contained in:
		| @@ -10,23 +10,23 @@ make_release() | ||||
| 	PLATFORM=$2 | ||||
| 	shift 2 | ||||
|  | ||||
| 	rm -r build-${RELEASE} | ||||
| 	mkdir -p build-${RELEASE} | ||||
| 	rm -r hyperion.ng-${RELEASE} | ||||
| 	mkdir -p hyperion.ng-${RELEASE} | ||||
| 	rm -r deploy/${RELEASE} | ||||
| 	mkdir -p deploy/${RELEASE} | ||||
|  | ||||
| 	cd  build-${RELEASE} | ||||
| 	cd  hyperion.ng-${RELEASE} | ||||
| 	cmake -DCMAKE_INSTALL_PREFIX=/usr -DPLATFORM=${PLATFORM} $@ -DCMAKE_BUILD_TYPE=Release -Wno-dev .. || exit 1 | ||||
| 	make -j $(nproc)  || exit 1 | ||||
| 	#strip bin/* | ||||
| 	make package -j $(nproc) | ||||
| 	mv Hyperion-*.* ../deploy/${RELEASE} | ||||
| 	mv Hyperion.NG-* ../deploy/${RELEASE} | ||||
| 	cd .. | ||||
| 	bin/create_release.sh . ${RELEASE} | ||||
| } | ||||
|  | ||||
| CMAKE_PROTOC_FLAG="-DIMPORT_PROTOC=../build-x86x64/protoc_export.cmake" | ||||
| CMAKE_FLATC_FLAG="-DIMPORT_FLATC=../build-x86x64/flatc_export.cmake" | ||||
| CMAKE_PROTOC_FLAG="-DIMPORT_PROTOC=../hyperion.ng-x86x64/protoc_export.cmake" | ||||
| CMAKE_FLATC_FLAG="-DIMPORT_FLATC=../hyperion.ng-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} | ||||
|   | ||||
| @@ -7,24 +7,24 @@ fi | ||||
|  | ||||
| repodir="$1" | ||||
| buildid="$2" | ||||
| builddir=$repodir/build-$buildid | ||||
| builddir=$repodir/hyperion.ng-$buildid | ||||
| echo build directory = $builddir | ||||
| echo repository root dirrectory = $repodir | ||||
| echo repository root directory = $repodir | ||||
| if ! [ -d "$builddir" ]; then | ||||
| 	echo "Could not find build director" | ||||
| 	exit 1 | ||||
| fi | ||||
| 	 | ||||
| outfile="$repodir/deploy/hyperion_$buildid.tar.gz" | ||||
| outfile="$repodir/deploy/hyperion.ng_$buildid.tar.gz" | ||||
| echo create $outfile | ||||
|  | ||||
| tar --create --gzip --absolute-names --show-transformed-names --ignore-failed-read\ | ||||
| 	--file "$outfile" \ | ||||
| 	--transform "s:$builddir/bin/:hyperion/bin/:" \ | ||||
| 	--transform "s:$repodir/config/:hyperion/config/:" \ | ||||
| 	--transform "s:$repodir/bin/service/hyperion.init.sh:hyperion/services/hyperion.init.sh:" \ | ||||
| 	--transform "s:$repodir/bin/service/hyperion.systemd.sh:hyperion/services/hyperion.systemd.sh:" \ | ||||
| 	--transform "s:$repodir/bin/service/hyperion.initctl.sh:hyperion/services/hyperion.initctl.sh:" \ | ||||
| 	--transform "s:$repodir/bin/service/hyperion.init:hyperion/services/hyperion.init:" \ | ||||
| 	--transform "s:$repodir/bin/service/hyperion.systemd:hyperion/services/hyperion.systemd:" \ | ||||
| 	--transform "s:$repodir/bin/service/hyperion.initctl:hyperion/services/hyperion.initctl:" \ | ||||
| 	--transform "s://:/:g" \ | ||||
| 	"$builddir/bin/hyperion"* \ | ||||
| 	"$repodir/bin/service/hyperion.init" \ | ||||
|   | ||||
		Reference in New Issue
	
	Block a user