diff options
| -rw-r--r-- | Makefile.distrib | 10 | ||||
| -rw-r--r-- | support/scripts/website.sh | 33 |
2 files changed, 28 insertions, 15 deletions
diff --git a/Makefile.distrib b/Makefile.distrib index 075d865da4..711bb9628a 100644 --- a/Makefile.distrib +++ b/Makefile.distrib @@ -250,8 +250,11 @@ ia-build-unix : $(RM) -r $(IA_BUILD_PREFIX)/$(PROJECT_NAME)-$(INSTALL_VERSION) $(IA) $(IA_BUILD_PREFIX)/$(notdir $(IA_BUILD_PROJECTFILE)) $(INSTALL) -m 755 -d $(IA_INSTALL_PREFIX) - $(strip $(TAR) cf - -C $(IA_BUILD_OUTPUTDIR) Web_Installers | \ + $(strip $(TAR) cf - -C $(IA_BUILD_OUTPUTDIR) Web_Installers/InstData |\ $(TAR) xf - -C $(IA_INSTALL_PREFIX)) + $(CHMOD) 644 $(IA_BUILD_OUTPUTDIR)/Web_Installers/install.htm + $(strip $(CP) -a $(IA_BUILD_OUTPUTDIR)/Web_Installers/install.htm \ + $(IA_INSTALL_PREFIX)/Web_Installers/install-unix.htm) ia-build-windows : $(INSTALL) -m 644 -p $(IA_CONFIG_PREFIX)/tools.zip $(IA_BUILD_PREFIX) @@ -262,8 +265,11 @@ ia-build-windows : $(RM) -r $(IA_BUILD_PREFIX)/$(PROJECT_NAME)-$(INSTALL_VERSION) $(IA) $(IA_BUILD_PREFIX)/$(notdir $(IA_BUILD_PROJECTFILE)) $(INSTALL) -m 755 -d $(IA_INSTALL_PREFIX) - $(strip $(TAR) cf - -C $(IA_BUILD_OUTPUTDIR) Web_Installers | \ + $(strip $(TAR) cf - -C $(IA_BUILD_OUTPUTDIR) Web_Installers/InstData |\ $(TAR) xf - -C $(IA_INSTALL_PREFIX)) + $(CHMOD) 644 $(IA_BUILD_OUTPUTDIR)/Web_Installers/install.htm + $(strip $(CP) -a $(IA_BUILD_OUTPUTDIR)/Web_Installers/install.htm \ + $(IA_INSTALL_PREFIX)/Web_Installers/install-windows.htm) ia-build-all : ia-build-common ia-build-all : ia-build-unix diff --git a/support/scripts/website.sh b/support/scripts/website.sh index 026dfce13d..27907cbf0a 100644 --- a/support/scripts/website.sh +++ b/support/scripts/website.sh @@ -176,6 +176,24 @@ function website-print-xml-installers-add-archives() { "${add[@]}" "zip" "zip" "Zip Archive (Windows)"; } +function website-print-xml-installers-get-params() { + [ $# = 1 ] || abort "internal error"; + local installhtm="$1"; shift 1; + + if [ ! -f "$installhtm" ]; then + warning "could not find file '$installhtm'"; + return 1; + fi; + + local start=`grep -n "^setArchiveFile()\$" "$installhtm"`; + local end=`grep -n "^platformButtons()\$" "$installhtm"`; + start=$[${start%%:*} + 3]; + end=$[${end%%:*} - 2]; + + head -$end "$installhtm" | tail -$[$end - $start] \ + | sed '-es/[ ]*//' '-es!>$!/>!' '-e/^$/d'; +} + function website-print-xml-installers() { local program="$FUNCNAME"; local version='$Revision$'; @@ -192,23 +210,12 @@ function website-print-xml-installers() { $program-add-archives "$basepath"; echo "</installers>"; - local installhtm="$basepath.ia/Web_Installers/install.htm"; - if [ ! -f "$installhtm" ]; then - warning "could not find file '$installhtm'"; - return 1; - fi; - - local start=`grep -n "^setArchiveFile()\$" "$installhtm"`; - local end=`grep -n "^platformButtons()\$" "$installhtm"`; - start=$[${start%%:*} + 3]; - end=$[${end%%:*} - 2]; - echo ""; echo "<webinstaller>"; echo ""; echo "<params>"; - head -$end "$installhtm" | tail -$[$end - $start] \ - | sed '-es/[ ]*//' '-es!>$!/>!' '-e/^$/d'; + $program-get-params "$basepath.ia/Web_Installers/install-unix.htm"; + $program-get-params "$basepath.ia/Web_Installers/install-windows.htm"; echo "</params>"; echo ""; echo "</webinstaller>"; |