[QGIS Commit] r14717 - in trunk/qgis/ms-windows: . osgeo4w
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Fri Nov 19 17:01:40 EST 2010
Author: jef
Date: 2010-11-19 14:01:40 -0800 (Fri, 19 Nov 2010)
New Revision: 14717
Modified:
trunk/qgis/ms-windows/QGIS-Installer.nsi
trunk/qgis/ms-windows/osgeo4w/creatensis.pl
Log:
update osgeo4w version nsis installer
Modified: trunk/qgis/ms-windows/QGIS-Installer.nsi
===================================================================
--- trunk/qgis/ms-windows/QGIS-Installer.nsi 2010-11-19 17:40:58 UTC (rev 14716)
+++ trunk/qgis/ms-windows/QGIS-Installer.nsi 2010-11-19 22:01:40 UTC (rev 14717)
@@ -38,7 +38,7 @@
;NSIS Includes
-!include "MUI2.nsh"
+!include "MUI.nsh"
!include "LogicLib.nsh"
;----------------------------------------------------------------------------------------------------------------------------
@@ -89,6 +89,7 @@
!define INSTALLER_DISPLAYED_NAME "${DISPLAYED_NAME}"
!addplugindir osgeo4w/untgz
+ !addplugindir osgeo4w/nsis
!endif
;----------------------------------------------------------------------------------------------------------------------------
@@ -282,6 +283,7 @@
;Installer Pages
+!define MUI_WELCOMEPAGE_TITLE_3LINES
!insertmacro MUI_PAGE_WELCOME
!insertmacro MUI_PAGE_LICENSE ".\Installer-Files\LICENSE.txt"
@@ -290,6 +292,7 @@
!insertmacro MUI_PAGE_COMPONENTS
!insertmacro MUI_PAGE_INSTFILES
+!define MUI_FINISHPAGE_TITLE_3LINES
!insertmacro MUI_PAGE_FINISH
!insertmacro MUI_UNPAGE_WELCOME
@@ -301,6 +304,19 @@
; Language files
!insertmacro MUI_LANGUAGE "English"
+!insertmacro MUI_LANGUAGE "German"
+!insertmacro MUI_LANGUAGE "French"
+!insertmacro MUI_LANGUAGE "Russian"
+!insertmacro MUI_LANGUAGE "Japanese"
+!insertmacro MUI_LANGUAGE "Italian"
+!insertmacro MUI_LANGUAGE "Polish"
+!insertmacro MUI_LANGUAGE "Spanish"
+!insertmacro MUI_LANGUAGE "PortugueseBR"
+!insertmacro MUI_LANGUAGE "Portuguese"
+!insertmacro MUI_LANGUAGE "Czech"
+!insertmacro MUI_LANGUAGE "Croatian"
+!insertmacro MUI_LANGUAGE "Thai"
+!insertmacro MUI_LANGUAGE "Dutch"
;----------------------------------------------------------------------------------------------------------------------------
@@ -397,34 +413,34 @@
;Create the Desktop Shortcut
SetShellVarContext current
-
-!if ${INSTALLER_TYPE} == "OSGeo4W"
- CreateShortCut "$DESKTOP\${QGIS_BASE}.lnk" "$INSTALL_DIR\bin\nircmd.exe" 'exec hide "$INSTALL_DIR\bin\qgis-dev.bat"' \
- "$INSTALL_DIR\icons\QGIS.ico" "" SW_SHOWNORMAL "" "Launch ${COMPLETE_NAME}"
-!else
- CreateShortCut "$DESKTOP\${QGIS_BASE}.lnk" "$INSTALL_DIR\bin\qgis.exe" ""\
- "$INSTALL_DIR\icons\QGIS.ico" "" SW_SHOWNORMAL "" "Launch ${COMPLETE_NAME}"
-!endif
;Create the Windows Start Menu Shortcuts
SetShellVarContext all
CreateDirectory "$SMPROGRAMS\${QGIS_BASE}"
-!if ${INSTALLER_TYPE} == "OSGeo4W"
- CreateShortCut "$SMPROGRAMS\${QGIS_BASE}\${QGIS_BASE}.lnk" "$INSTALL_DIR\bin\nircmd.exe" 'exec hide "$INSTALL_DIR\bin\qgis-dev.bat"' \
- "$INSTALL_DIR\icons\QGIS.ico" "" SW_SHOWNORMAL "" "Launch ${COMPLETE_NAME}"
-!else
- CreateShortCut "$SMPROGRAMS\${QGIS_BASE}\${QGIS_BASE}.lnk" "$INSTALL_DIR\bin\qgis.exe" ""\
- "$INSTALL_DIR\icons\QGIS.ico" "" SW_SHOWNORMAL "" "Launch ${COMPLETE_NAME}"
-!endif
-
GetFullPathName /SHORT $0 $INSTALL_DIR
System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i("OSGEO4W_ROOT", "$0").r0'
System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i("OSGEO4W_STARTMENU", "$SMPROGRAMS\${QGIS_BASE}").r0'
ReadEnvStr $0 COMSPEC
nsExec::ExecToLog '"$0" /c "$INSTALL_DIR\postinstall.bat"'
+
+!if ${INSTALLER_TYPE} == "OSGeo4W"
+ Delete "$DESKTOP\Quantum GIS (${VERSION_NUMBER}).lnk"
+ CreateShortCut "$DESKTOP\Quantum GIS (${VERSION_NUMBER}).lnk" "$INSTALL_DIR\bin\nircmd.exe" 'exec hide "$INSTALL_DIR\bin\qgis.bat"' \
+ "$INSTALL_DIR\icons\QGIS.ico" "" SW_SHOWNORMAL "" "Launch ${COMPLETE_NAME}"
+
+ Delete "$SMPROGRAMS\${QGIS_BASE}\Quantum GIS (${VERSION_NUMBER}).lnk"
+ CreateShortCut "$SMPROGRAMS\${QGIS_BASE}\Quantum GIS (${VERSION_NUMBER}).lnk" "$INSTALL_DIR\bin\nircmd.exe" 'exec hide "$INSTALL_DIR\bin\qgis.bat"' \
+ "$INSTALL_DIR\icons\QGIS.ico" "" SW_SHOWNORMAL "" "Launch ${COMPLETE_NAME}"
+!else
+ CreateShortCut "$DESKTOP\${QGIS_BASE}.lnk" "$INSTALL_DIR\bin\qgis.exe" ""\
+ "$INSTALL_DIR\icons\QGIS.ico" "" SW_SHOWNORMAL "" "Launch ${COMPLETE_NAME}"
+ CreateShortCut "$SMPROGRAMS\${QGIS_BASE}\${QGIS_BASE}.lnk" "$INSTALL_DIR\bin\qgis.exe" ""\
+ "$INSTALL_DIR\icons\QGIS.ico" "" SW_SHOWNORMAL "" "Launch ${COMPLETE_NAME}"
+!endif
+
SectionEnd
Function DownloadDataSet
@@ -554,6 +570,7 @@
Delete "$INSTDIR\preremove.bat.done"
Delete "$INSTDIR\preremove.bat"
Delete "$INSTDIR\preremove.log"
+ Delete "$INSTDIR\*.txt"
RMDir /r "$INSTDIR\bin"
RMDir /r "$INSTDIR\apps"
@@ -562,6 +579,7 @@
RMDir /r "$INSTDIR\lib"
RMDir /r "$INSTDIR\share"
RMDir /r "$INSTDIR\icons"
+
!else
;remove files
Delete "$INSTDIR\Uninstall-QGIS.exe"
Modified: trunk/qgis/ms-windows/osgeo4w/creatensis.pl
===================================================================
--- trunk/qgis/ms-windows/osgeo4w/creatensis.pl 2010-11-19 17:40:58 UTC (rev 14716)
+++ trunk/qgis/ms-windows/osgeo4w/creatensis.pl 2010-11-19 22:01:40 UTC (rev 14717)
@@ -13,6 +13,11 @@
# Download OSGeo4W packages
#
+unless(-f "nsis/System.dll") {
+ mkdir "nsis", 0755 unless -d "nsis";
+ system "wget -q -Onsis/System.dll http://qgis.org/downloads/System.dll";
+}
+
mkdir "packages", 0755 unless -d "packages";
chdir "packages";
@@ -52,16 +57,16 @@
}
}
-getDeps("qgis-dev");
+getDeps("qgis");
-if(-f "../addons/bin/NCSEcw.dll") {
+if(-f "../addons/bin/NCSEcw4_RO.dll") {
print "Enabling ECW support...\n";
- getDeps("gdal16-ecw")
+ getDeps("gdal17-ecw")
}
if(-f "../addons/bin/lti_dsdk_dll.dll") {
print "Enabling MrSID support...\n";
- getDeps("gdal16-mrsid")
+ getDeps("gdal17-mrsid")
}
@@ -104,7 +109,7 @@
system "cd apps/nircmd; unzip ../../../packages/nircmd.zip && mv nircmd.exe ../../bin";
- system "tar -C ../addons -cf . | tar -xf -" if -d "../addons";
+ system "tar -C ../addons -cf - . | tar -xf -" if -d "../addons";
chdir "..";
}
@@ -193,6 +198,10 @@
$revision =~ s/\D+$//g;
close F;
+$revision = 14615 unless $revision =~ /^\d+$/;
+
+system "unzip packages/Untgz.zip" unless -d "untgz";
+
chdir "..";
my $cmd = "makensis";
@@ -201,7 +210,7 @@
$cmd .= " -DSVN_REVISION='$revision'";
$cmd .= " -DQGIS_BASE='Quantum GIS $release'";
$cmd .= " -DINSTALLER_NAME='QGIS-OSGeo4W-$major.$minor.$patch-$revision-Setup.exe'";
-$cmd .= " -DDISPLAYED_NAME='Quantum GIS OSGeo4W ($release)'";
+$cmd .= " -DDISPLAYED_NAME='Quantum GIS \'$release\' ($major.$minor.$patch)'";
$cmd .= " -DBINARY_REVISION=1";
$cmd .= " -DINSTALLER_TYPE=OSGeo4W";
$cmd .= " -DPACKAGE_FOLDER=osgeo4w/unpacked";
More information about the QGIS-commit
mailing list