Changes between Version 42 and Version 43 of PackagingInstructions

Timestamp:

Jun 19, 2021, 2:26:47 PM (3 years ago)

Author:

jef

Comment:

--

PackagingInstructions

@@ -9 +9 @@
 The installed OSGeo4W directory tree is described in DirectoryLayout.
 
-OSGeo4W packages are generally structured like packages for Cygwin as described at http://cygwin.com/setup.html . And support two architectures x86 (32bit) and x86_64 (64bit).
+OSGeo4W packages are generally structured like packages for Cygwin as described at http://cygwin.com/setup.html . And support x86_64 (64bit).
 
 Packages prepared for OSGeo4W are currently uploaded to (requires shell access to [http://wiki.osgeo.org/wiki/Download_Server OSGeo download server]): 
 
- upload.osgeo.org:/osgeo/download/osgeo4w/release/<arch>/<package>
-
-This tree can be reviewed at: http://download.osgeo.org/osgeo4w/<arch>/release
+ upload.osgeo.org:/osgeo/download/osgeo4w/v2/release/x86_64/<package>
+
+This tree can be reviewed at: http://download.osgeo.org/osgeo4w/v2/x86_64/release
 
 [[Image(package-name.png, right)]]Each package directory should have a single setup.hint file, and one or more versions of that package as a .tar.bz2 file.  These should normally have names like gdal-1.5.0-7.tar.bz2 where "1.5.0" is the version of GDAL that was packaged, and "-1" indicates the version of the packaging attempt.  The directory can also contain corresponding source snapshots named like gdal-1.5.0-7-src.tar.bz2.   Note that the basename should exactly match the directory in which the package is found.  So the "gdal" directory has gdal-<version>-<revision>.tar.bz2 package files.
@@ -28 +28 @@
 
  * the /osgeo4w/apps/ directory exists to hold applications.  Your application must be installed in a subdirectory of the /osgeo4w/apps/ directory, preferably with a meaningful name (in lowercase).
- * the Apache alias "/ms_tmp/" exists to access temporary web-accessible files, which points to the directory /osgeo4w/tmp/ms_tmp/
- * the Apache alias "/cgi-bin/" points to the /osgeo4w/bin/ folder.  e.g. mapserv.exe lives in the /bin folder.
  * the /osgeo4w/httpd.d/ directory exists to hold Apache Alias Files.  This directory is automatically scanned by Apache when it starts.  The following is an alias example for an application named 'foobar':
 
@@ -138 +136 @@
 The environment variables {{{OSGEO4W_MENU_LINKS}}} and {{{OSGEO4W_DESKTOP_LINKS}}} are set by the installer (since 1.0.6-5) and reflect whether or not the corresponding option was checked.
 
-Alternativly the msvcrt package shortcuts can be created with {{{nircmd}}} (see [http://www.nirsoft.net/utils/nircmd.html nircmd]).  Example from the qgis-dev postinstall:
-
-{{{
-REM get short path without blanks
-for %%i in ("%OSGEO4W_ROOT%") do set O4W_ROOT=%%~fsi
-
-if not %OSGEO4W_MENU_LINKS%==0 mkdir "%OSGEO4W_STARTMENU%"
-if not %OSGEO4W_MENU_LINKS%==0 nircmd shortcut "%O4W_ROOT%\bin\nircmd.exe" "%OSGEO4W_STARTMENU%" "QGIS Desktop 1.9.0" "exec hide %O4W_ROOT%\bin\qgis-dev.bat" "%O4W_ROOT%\apps\qgis-dev\icons\QGIS.ico"
-if not %OSGEO4W_MENU_LINKS%==0 nircmd shortcut "%O4W_ROOT%\bin\nircmd.exe" "%OSGEO4W_STARTMENU%" "QGIS Browser 1.9.0" "exec hide %O4W_ROOT%\bin\qgis-dev-browser.bat" "%O4W_ROOT%\apps\qgis-dev\icons\QGIS.ico"
-
-if not %OSGEO4W_DESKTOP_LINKS%==0 mkdir "%OSGEO4W_DESKTOP%"
-if not %OSGEO4W_DESKTOP_LINKS%==0 nircmd shortcut "%O4W_ROOT%\bin\nircmd.exe" "%OSGEO4W_DESKTOP%" "QGIS Desktop 1.9.0" "exec hide %O4W_ROOT%\bin\qgis-dev.bat" "%O4W_ROOT%\apps\qgis-dev\icons\QGIS.ico"
-if not %OSGEO4W_DESKTOP_LINKS%==0 nircmd shortcut "%O4W_ROOT%\bin\nircmd.exe" "%OSGEO4W_DESKTOP%" "QGIS Browser 1.9.0" "exec hide %O4W_ROOT%\bin\qgis-dev-browser.bat" "%O4W_ROOT%\apps\qgis-dev\icons\QGIS.ico"
-}}}
-
-''Note:'' that this also uses {{{nircmd}}} to start the batch job, which has the advantage that there is no command line window flashing up when a desktop application starts.
+Example from the qgis-dev postinstall:
+
+{{{
+call "%OSGEO4W_ROOT%\bin\o4w_env.bat"
+
+if not defined OSGEO4W_DESKTOP for /F "tokens=* USEBACKQ" %%F IN (`getspecialfolder Desktop`) do set OSGEO4W_DESKTOP=%%F
+for /F "tokens=* USEBACKQ" %%F IN (`getspecialfolder Documents`) do set DOCUMENTS=%%F
+
+call "%OSGEO4W_ROOT%\bin\qgis-dev.bat" --postinstall
+echo on
+
+if not %OSGEO4W_MENU_LINKS%==0 if not exist "%OSGEO4W_STARTMENU%" mkdir "%OSGEO4W_STARTMENU%"
+if not %OSGEO4W_DESKTOP_LINKS%==0 if not exist "%OSGEO4W_DESKTOP%" mkdir "%OSGEO4W_DESKTOP%"
+
+if not %OSGEO4W_MENU_LINKS%==0 xxmklink "%OSGEO4W_STARTMENU%\QGIS Desktop 3.21.0 (Nightly).lnk" "%OSGEO4W_ROOT%\bin\qgis-dev-bin.exe" "" "%DOCUMENTS%"
+if not %OSGEO4W_DESKTOP_LINKS%==0 xxmklink "%OSGEO4W_DESKTOP%\QGIS Desktop 3.21.0 (Nightly).lnk" "%OSGEO4W_ROOT%\bin\qgis-dev-bin.exe" "" "%DOCUMENTS%"
+
+if not %OSGEO4W_MENU_LINKS%==0 xxmklink "%OSGEO4W_STARTMENU%\Qt Designer with QGIS 3.21.0 custom widgets (Nightly).lnk" "%OSGEO4W_ROOT%\bin\bgspawn.exe" "\"%OSGEO4W_ROOT%\bin\qgis-dev-designer.bat\"" "%DOCUMENTS%" "" 1 "%OSGEO4W_ROOT%\apps\qgis-dev\icons\QGIS.ico"
+if not %OSGEO4W_DESKTOP_LINKS%==0 xxmklink "%OSGEO4W_DESKTOP%\Qt Designer with QGIS 3.21.0 custom widgets (Nightly).lnk" "%OSGEO4W_ROOT%\bin\bgspawn.exe" "\"%OSGEO4W_ROOT%\bin\qgis-dev-designer.bat\"" "%DOCUMENTS%" "" 1 "%OSGEO4W_ROOT%\apps\qgis-dev\icons\QGIS.ico"
+}}}
+
+''Note:'' that this also uses {{{bgspawn}}} to the batch jobs, which has the advantage that there is no command line window flashing up when a desktop application starts.
 
 The postinstall scripts can run any DOS command or installed binary with desired arguments.
@@ -193 +197 @@
 == Setup.ini ==
 
-The setup.exe actually downloads one of the setup.ini files ([http://download.osgeo.org/osgeo4w/x86/setup.ini 32bit] or [http://download.osgeo.org/osgeo4w/x86_64/setup.ini 64bit]) with a list of all packages each time it is run.  These files should be recreated on the server by running the script invoking `osgeo4w-regen.sh` on the web each time packages are uploaded.  This produces a test versions of these files (http://download.osgeo.org/osgeo4w/<arch>/setup_test.ini), which can be used with the setup program (by invoking setup-test.bat in the OSGeo4W shell).  Once this has been tested, using the link `osgeo4w-promote.sh` to copy this file to setup.ini, making it live for regular users. 
-
- * Generate test versions of setup.ini: `http://upload.osgeo.org/cgi-bin/osgeo4w-regen.sh`
- * Verify package version numbers (see top of PackageListing)
- * Test by invoking setup-test.bat in the OSGeo4W shell
- * Promote test setup to live: `http://upload.osgeo.org/cgi-bin/osgeo4w-promote.sh`
-
-''Note:'' the nightly build of QGIS (package {{{qgis-dev}}}) is build and uploaded around 00:00 UTC / 16:00 PST in the process the {{{setup.ini}}}} is updated and promoted automatically.
+The setup.exe actually downloads one of the setup.ini files ([http://download.osgeo.org/osgeo4w/v2/x86_64/setup.ini 64bit]) with a list of all packages each time it is run.  These files should be recreated on the server by running the script invoking ``http://upload.osgeo.org/cgi-bin/osgeo4w-regen-v2.sh` on the web each time packages are uploaded.
+
 == Documenting ==