Skip to content

Commit

Permalink
standalone installer localization and some fixes
Browse files Browse the repository at this point in the history 
git-svn-id: http://svn.osgeo.org/qgis/branches/Release-1_5_0@14094 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Aug 16, 2010
1 parent ab93815 commit ff0c888
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 22 deletions.
53 changes: 37 additions & 16 deletions ms-windows/QGIS-Installer.nsi
View file
Expand Up @@ -304,6 +304,19 @@ FunctionEnd

; 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"

;----------------------------------------------------------------------------------------------------------------------------

Expand Down Expand Up @@ -402,27 +415,11 @@ Section "Quantum GIS" SecQGIS
;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.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.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

CreateShortCut "$SMPROGRAMS\${QGIS_BASE}\Quantum GIS Web Site.lnk" "$INSTALL_DIR\QGIS-WebSite.url" ""\
"$INSTALL_DIR\icons\QGIS_Web.ico" "" SW_SHOWNORMAL "" "Visit the Quantum GIS Web Site"

Expand All @@ -435,6 +432,26 @@ Section "Quantum GIS" SecQGIS

ReadEnvStr $0 COMSPEC
nsExec::ExecToLog '"$0" /c "$INSTALL_DIR\postinstall.bat"'

!if ${INSTALLER_TYPE} == "OSGeo4W"
; Overwrite the shortcuts created by qgis' postinstall
; "%OSGEO4W_STARTMENU%\Quantum GIS (1.5.0).lnk"
; "%ALLUSERSPROFILE%\Desktop\Quantum GIS (1.5.0).lnk"

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
Expand Down Expand Up @@ -565,13 +582,17 @@ Section "Uninstall"
Delete "$INSTDIR\preremove.bat"
Delete "$INSTDIR\preremove.log"

Delete "$INSTDIR\QGIS-WebSite.url"
Delete "$INSTDIR\*.txt"

RMDir /r "$INSTDIR\bin"
RMDir /r "$INSTDIR\apps"
RMDir /r "$INSTDIR\etc"
RMDir /r "$INSTDIR\include"
RMDir /r "$INSTDIR\lib"
RMDir /r "$INSTDIR\share"
RMDir /r "$INSTDIR\icons"

!else
;remove files
Delete "$INSTDIR\Uninstall-QGIS.exe"
Expand Down
19 changes: 13 additions & 6 deletions ms-windows/osgeo4w/creatensis.pl
View file
Expand Up @@ -18,13 +18,13 @@

my $root = "http://download.osgeo.org/osgeo4w";

system "wget -q -c http://nsis.sourceforge.net/mediawiki/images/9/9d/Untgz.zip" unless -f "Untgz.zip";
system "wget -q -c http://www.nirsoft.net/utils/nircmd.zip" unless -f "nircmd.zip";
system "wget -q -Nc http://nsis.sourceforge.net/mediawiki/images/9/9d/Untgz.zip" unless -f "Untgz.zip";
system "wget -q -Nc http://www.nirsoft.net/utils/nircmd.zip" unless -f "nircmd.zip";

my %dep;
my %file;

system "wget -q -c $root/setup.ini";
system "wget -q -Nc $root/setup.ini";
open F, "setup.ini" || die "setup.ini not found";
while(<F>) {
chop;
Expand Down Expand Up @@ -64,16 +64,24 @@ sub getDeps {
getDeps("gdal16-mrsid")
}

my %referenced;
foreach my $p ( keys %pkgs ) {
$f = "$root/$file{$p}";
$f =~ s/\/\.\//\//g;

my($file) = $f =~ /([^\/]+)$/;
$referenced{$file} = 1;

next if -f $file;

print "Downloading $file [$f]...\n";
system "wget -q -c $f";
system "wget -q -Nc $f";
}

for my $p (<*.tar.bz2>) {
next if exists $referenced{$p};
print "Removing package $p...\n";
unlink $p;
}

chdir "..";
Expand All @@ -84,7 +92,6 @@ sub getDeps {
# Add addons
#


system "rm -rf unpacked" if -d "unpacked" && !grep(/^-k$/, @ARGV);

unless(-d "unpacked") {
Expand Down Expand Up @@ -202,7 +209,7 @@ sub getDeps {
$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";
Expand Down

0 comments on commit ff0c888

Please sign in to comment.