Exclude "osx" files, not "mac" ones, from Inno Setup file.

[wxWidgets.git] / build / tools / git-make-release

diff --git a/build/tools/git-make-release b/build/tools/git-make-release
index f0e7c7dcb135a6e9b4de742898e11c14ec9271f8..6dcfc9681f7f81902d76dd813493b6c134e1bb09 100755 (executable)
--- a/build/tools/git-make-release
+++ b/build/tools/git-make-release
@@ -32,6 +32,12 @@ if [ -z "$version" ]; then
     exit 1
 fi
 
+EOL_FILE=../eol-native
+if [ ! -r "$EOL_FILE" ]; then
+    echo "Use build/tools/svn-find-native-eols.pl to generate $EOL_FILE." >&2
+    exit 1
+fi
+
 set -e
 set -x
 
@@ -48,21 +54,31 @@ cleanup
 
 git archive --prefix=$prefix/ HEAD | (cd ..; tar x)
 cd ..
-mv $prefix/include/wx/msw/setup0.h $prefix/include/wx/msw/setup.h
+# All setup0.h files are supposed to be renamed to just setup.h when checked
+# out and in the distribution.
+find $prefix/include/wx -type f -name setup0.h | while read f; do
+    mv $f ${f%0.h}.h
+done
+
+# Compile gettext catalogs.
+make -C $prefix/locale allmo
 
 tar cjf $prefix.tar.bz2 $prefix
 
 cd $prefix
 set +x
-for f in `cat ../eol-native`; do
-    if [ $f == "include/wx/msw/setup0.h" ]; then
-        # we renamed this file above so adjust
-        f="include/wx/msw/setup.h"
-    fi
-    unix2dos $f
+for f in `cat $EOL_FILE`; do
+    case $f in
+        */setup0.h)
+            # we renamed this file above so adjust
+            f=${f%0.h}.h
+            ;;
+    esac
+    unix2dos -q $f
 done
 set -x
 
 zip -q -r ../$prefix.zip .
 
 7z a ../$prefix.7z . >/dev/null
+7z a ../${prefix}_Headers.7z include >/dev/null