Mercurial > mxe-octave
changeset 3010:8ac67219c241
Updates for nsis build and installer creation
* makeinst-script.sh: Added installer icon.
* mk-dist: Changed call for sh makeinst-script.sh to use $SHELL, and print out when completed successfully.
* src/uuid.mk: remove libuuid.dll.a after install of libuuid.dll
| author | John Donoghue <john.donoghue@ieee.org> |
|---|---|
| date | Fri, 31 May 2013 18:29:31 -0400 |
| parents | 23989e9403a3 |
| children | 75e142c0004b |
| files | makeinst-script.sh mk-dist src/uuid.mk |
| diffstat | 3 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/makeinst-script.sh Thu May 30 17:00:49 2013 -0400 +++ b/makeinst-script.sh Fri May 31 18:29:31 2013 -0400 @@ -28,6 +28,7 @@ Name "Octave" OutFile "Octave-Installer.exe" InstallDir "c:\\$OCTAVE_SOURCE" +Icon "$OCTAVE_SOURCE\\$ICON" ShowInstDetails show ShowUnInstDetails show
--- a/mk-dist Thu May 30 17:00:49 2013 -0400 +++ b/mk-dist Fri May 31 18:29:31 2013 -0400 @@ -120,12 +120,13 @@ cd $TOPDIR/dist if [ $installer = "yes" ]; then - sh ../makeinst-script.sh $OCTAVE_TARGET-$DATE + $SHELL ../makeinst-script.sh $OCTAVE_TARGET-$DATE echo "Generating installer ..." $TOPDIR/usr/bin/$TARGET-makensis octave.nsi > /dev/null if [ -e Octave-Installer.exe ]; then + echo "Installer created" rm octave.nsi fi
--- a/src/uuid.mk Thu May 30 17:00:49 2013 -0400 +++ b/src/uuid.mk Fri May 31 18:29:31 2013 -0400 @@ -17,5 +17,6 @@ if [ $(BUILD_SHARED) = yes ]; then \ $(INSTALL) -d '$(PREFIX)/$(TARGET)/bin'; \ $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(1)/lib/libuuid.a' --install '$(INSTALL)' --libdir '$(PREFIX)/$(TARGET)/lib' --bindir '$(PREFIX)/$(TARGET)/bin'; \ + rm -f '$(PREFIX)/$(TARGET)/lib/libuuid.dll.a'; \ fi endef