diff options
author | Juan Pablo Ugarte <juanpablougarte@gmail.com> | 2012-12-04 14:10:25 -0300 |
---|---|---|
committer | Juan Pablo Ugarte <juanpablougarte@gmail.com> | 2012-12-04 14:11:41 -0300 |
commit | 4025e7982d50ab6de96b8d4f886b996bfc9bd632 (patch) | |
tree | 81a48eace19c10fe0aefb5a47f4fd579e3f941b2 | |
parent | 7a44de2ae533b0bd0ad4c2a3ad02d6e26a820f3f (diff) | |
download | glade-4025e7982d50ab6de96b8d4f886b996bfc9bd632.tar.gz |
Added message to win32 installer about it being beta software
Updated installers script to include locale directories
-rw-r--r-- | build/mingw-w64/glade.nsi.in | 3 | ||||
-rw-r--r-- | build/mingw-w64/nsis_make_installer.sh | 19 |
2 files changed, 12 insertions, 10 deletions
diff --git a/build/mingw-w64/glade.nsi.in b/build/mingw-w64/glade.nsi.in index 99526b52..454f1e1c 100644 --- a/build/mingw-w64/glade.nsi.in +++ b/build/mingw-w64/glade.nsi.in @@ -40,6 +40,9 @@ RequestExecutionLevel user !insertmacro MUI_LANGUAGE "English" Function .onInit + + MessageBox MB_OK "This Glade build and installer are BETA SOFTWARE!$\nIt was cross compiled on Linux and tested with wine! (a Windows emulator)$\nand it is distributed with the hope it will be usefull as a starting point for a new Windows comunity$\nthat can support it and contribute back to make it better." + ReadRegStr $R0 HKLM \ "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "UninstallString" StrCmp $R0 "" done diff --git a/build/mingw-w64/nsis_make_installer.sh b/build/mingw-w64/nsis_make_installer.sh index 41536ba9..1deba982 100644 --- a/build/mingw-w64/nsis_make_installer.sh +++ b/build/mingw-w64/nsis_make_installer.sh @@ -54,7 +54,7 @@ case $1 in ;; make) DEVELOPER="false" - EXCLUDE_FILES="-o -name *.dll.a -o -name *.la" + EXCLUDE_FILES="( -path lib/pkgconfig -o -name *.dll.a -o -name *.la ) -prune -o" INCLUDE_DIR= ;; *) @@ -94,7 +94,7 @@ if test ! -d $MINGW_ROOT; then mv $MINGW_ROOT_BIN $MINGW_ROOT fi -if test x"$DEVELOPER"=xfalse -a ! -d $MINGW_ROOT_BIN; then +if test "$DEVELOPER" = "false" -a ! -d $MINGW_ROOT_BIN; then python3 download-mingw-rpm.py --deps gtk3 hicolor-icon-theme fi @@ -146,24 +146,23 @@ fi # Update schemas just in case glib-compile-schemas $MINGW_ROOT_BIN/share/glib-2.0/schemas -if test x"$DEVELOPER"=xtrue; then +if test $DEVELOPER = "true"; then cat > install_files.nsh << EOF - file /r /x locale lib - file /r /x locale share + file /r lib + file /r share file /r include EOF else cat > install_files.nsh << EOF - file /r /x locale /x pkgconfig /x *.dll.a /x *.la lib - file /r /x locale share + file /r /x pkgconfig /x *.dll.a /x *.la lib + file /r share EOF fi # Create a list of files to delete in the uninstaller # Note that we have to reverse the list to remove the directories once they are empty -find bin etc lib share $INCLUDE_DIR \ - \( -path share/locale -o -path lib/locale -o -path lib/pkgconfig $EXCLUDE_FILES \) -prune \ - -o -type f -printf "delete \"\$INSTDIR\\\%p\"\n" -or -type d -printf "rmDir \"\$INSTDIR\\\%p\"\n" \ +find bin etc lib share $INCLUDE_DIR $EXCLUDE_FILES \ + ! -type d -printf "delete \"\$INSTDIR\\\%p\"\n" -or -type d -printf "rmDir \"\$INSTDIR\\\%p\"\n" \ | sed 'y/\//\\/' | tac > uninstall_files.nsh # create installer |