sanitize branch name for filenames

Author: aureliendavid

Makefile

@@ -27,9 +27,12 @@ TAG:=$(shell git --git-dir=$(SRC_PATH)/.git describe --tags --abbrev=0 --match "
 VERSION:=$(shell echo `git --git-dir=$(SRC_PATH)/.git describe --tags --long --match "v*" || echo "UNKNOWN"` | sed "s/^$(TAG)-//")
 BRANCH:=$(shell git --git-dir=$(SRC_PATH)/.git rev-parse --abbrev-ref HEAD 2> /dev/null || echo "UNKNOWN")
 
+# strip illegal debian version string characters + illegal filename charachers
+DHBRANCH:=$(shell echo "$(BRANCH)" | sed 's/[^-+.0-9a-zA-Z~]/-/g' )
+
 version:
 	@if [ -d $(SRC_PATH)/".git" ]; then \
-		echo "#define GPAC_GIT_REVISION	\"$(VERSION)-$(BRANCH)\"" > $(GITREV_PATH).new; \
+		echo "#define GPAC_GIT_REVISION	\"$(VERSION)-$(DHBRANCH)\"" > $(GITREV_PATH).new; \
 		if ! diff -q $(GITREV_PATH) $(GITREV_PATH).new >/dev/null ; then \
 			mv $(GITREV_PATH).new  $(GITREV_PATH); \
 		fi; \
@@ -349,9 +352,6 @@ endif
 
 ifeq ($(CONFIG_LINUX),yes)
 
-# strip illegal debian version string characters
-DHBRANCH:=$(shell echo "$(BRANCH)" | sed 's/[^-+:.0-9a-zA-Z~]/-/g' )
-
 deb:
 	git checkout --	debian/changelog
 	fakeroot debian/rules clean

build/xcode/generate_ios.sh

@@ -7,7 +7,11 @@ version=`grep '#define GPAC_VERSION ' ../../include/gpac/version.h | cut -d '"'
 TAG=$(git describe --tags --abbrev=0 --match "v*" 2> /dev/null)
 REVISION=$(echo `git describe --tags --long --match "v*" 2> /dev/null || echo "UNKNOWN"` | sed "s/^$TAG-//")
 BRANCH=$(git rev-parse --abbrev-ref HEAD 2> /dev/null || echo "UNKNOWN")
-rev="$REVISION-$BRANCH"
+
+#sanitize branch name for filenames
+DHBRANCH=$(echo "$BRANCH" | sed 's/[^-+.0-9a-zA-Z~]/-/g' )
+
+rev="$REVISION-$DHBRANCH"
 if [ "$rev" != "" ]
 then
 	sed 's/<string>.*<\/string><!-- VERSION_REV_REPLACE -->/<string>'"$version"'<\/string>/' ../../applications/gpac/ios-Info.plist > ../../applications/gpac/ios-Info.plist.new

check_revision.sh

@@ -7,7 +7,11 @@ if [ -d ".git" ]; then
 TAG=$(git describe --tags --abbrev=0 --match "v*"  2>>gtmp)
 VERSION=$(echo `git describe --tags --long --match "v*"  2>>gtmp || echo "UNKNOWN"` | sed "s/^$TAG-//")
 BRANCH=$(git rev-parse --abbrev-ref HEAD 2>>gtmp || echo "UNKNOWN")
-revision="$VERSION-$BRANCH"
+
+#sanitize branch name for filenames
+DHBRANCH=$(echo "$BRANCH" | sed 's/[^-+.0-9a-zA-Z~]/-/g' )
+
+revision="$VERSION-$DHBRANCH"
 
 rm gtmp
 

generate_installer.bat

@@ -52,6 +52,16 @@ REM execute git and check if the result if found within revision.h
 for /f "delims=" %%a in ('git describe --tags --long  --match "v*" ') do @set VERSION=%%a
 for /f "delims=" %%a in ('git describe --tags --abbrev^=0  --match "v*"  ') do @set TAG=%%a-
 for /f "delims=" %%a in ('git rev-parse --abbrev-ref HEAD') do @set BRANCH=%%a
+
+REM sanitize BRANCH for filename
+set "BRANCH=%BRANCH:/=-%"
+set "BRANCH=%BRANCH:"=-%"
+set "BRANCH=%BRANCH:<=-%"
+set "BRANCH=%BRANCH:>=-%"
+set "BRANCH=%BRANCH:|=-%"
+set "BRANCH=%BRANCH:@=-%"
+
+
 REM remove anotated tag from VERSION
 setlocal enabledelayedexpansion
 call set VERSION=%%VERSION:!TAG!=%%

mkdmg.sh

@@ -40,8 +40,8 @@ cp $source_path/COPYING ./tmpdmg
 mkdir -p tmpdmg/GPAC.app/Contents/MacOS/modules
 mkdir -p tmpdmg/GPAC.app/Contents/MacOS/lib
 
-cp bin/gcc/gm* tmpdmg/GPAC.app/Contents/MacOS/modules
-cp bin/gcc/gf_* tmpdmg/GPAC.app/Contents/MacOS/modules
+cp bin/gcc/gm* tmpdmg/GPAC.app/Contents/MacOS/modules || true
+cp bin/gcc/gf_* tmpdmg/GPAC.app/Contents/MacOS/modules || true
 cp bin/gcc/libgpac.dylib tmpdmg/GPAC.app/Contents/MacOS/lib
 if [ -f bin/gcc/libopenhevc.1.dylib ]; then
     cp bin/gcc/libopenhevc.1.dylib tmpdmg/GPAC.app/Contents/MacOS/lib
@@ -83,7 +83,11 @@ cd $source_path
 TAG=$(git describe --tags --abbrev=0 --match "v*"  2> /dev/null)
 REVISION=$(echo `git describe --tags --long --match "v*"  2> /dev/null || echo "UNKNOWN"` | sed "s/^$TAG-//")
 BRANCH=$(git rev-parse --abbrev-ref HEAD 2> /dev/null || echo "UNKNOWN")
-rev="$REVISION-$BRANCH"
+
+#sanitize branch name for filenames
+DHBRANCH=$(echo "$BRANCH" | sed 's/[^-+.0-9a-zA-Z~]/-/g' )
+
+rev="$REVISION-$DHBRANCH"
 cd $cur_dir
 
 full_version=$version

version.bat

@@ -7,6 +7,15 @@ IF NOT EXIST .\.git\NUL GOTO not_git
 for /f "delims=" %%a in ('git describe --tags --long --match "v*" ') do @set VERSION=%%a
 for /f "delims=" %%a in ('git describe --tags --abbrev^=0 --match "v*" ') do @set TAG=%%a-
 for /f "delims=" %%a in ('git rev-parse --abbrev-ref HEAD') do @set BRANCH=%%a
+
+REM sanitize BRANCH for filename
+set "BRANCH=%BRANCH:/=-%"
+set "BRANCH=%BRANCH:"=-%"
+set "BRANCH=%BRANCH:<=-%"
+set "BRANCH=%BRANCH:>=-%"
+set "BRANCH=%BRANCH:|=-%"
+set "BRANCH=%BRANCH:@=-%"
+
 REM remove anotated tag from VERSION
 setlocal enabledelayedexpansion
 call set VERSION=%%VERSION:!TAG!=%%