Okay,
I've made a tarball for 0.40pre1 so that people can make packages for testing. This is not feature complete for 0.40, but it would be nice if everyone could use this to find more bugs. We want to continue our tradition of having quality releases! Also, we'd like to find any packaging bugs that may have shown up.
https://sourceforge.net/project/showfiles.php?group_id=93438&package_id=...
Thanks everyone for their help!
--Ted
Hi, I tested the old NSIS-installer script for win32 (inkscape2.nsi) and had to shape up a little bit. The version numbers are hardcoded in this file. Could someone please patch those changes in the cvs .? Thanks.
Also there is an inkscape.nsi installer script, that will not be used and can removed from the codebase.
With my installation (CVS from today) I can not open the .svgz from the example directory. I think this will block a release.
HTH,
Adib.
Index: inkscape2.nsi =================================================================== RCS file: /cvsroot/inkscape/inkscape/inkscape2.nsi,v retrieving revision 1.1 diff -u -r1.1 inkscape2.nsi --- inkscape2.nsi 10 Apr 2004 17:58:37 -0000 1.1 +++ inkscape2.nsi 30 Oct 2004 22:36:38 -0000 @@ -7,7 +7,7 @@ ; DEFINES ; ####################################### !define PRODUCT_NAME "Inkscape" -!define PRODUCT_VERSION "0.38.1" +!define PRODUCT_VERSION "0.40pre1-1" !define PRODUCT_PUBLISHER "Inkscape Organization" !define PRODUCT_WEB_SITE "http://www.inkscape.org" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\inkscape.exe" @@ -20,14 +20,14 @@ ; MUI 1.67 compatible ------ !include "MUI.nsh" !define MUI_ABORTWARNING -!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\win-install.ico" -!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\win-uninstall.ico" +!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\modern-install.ico" +!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"
; Welcome page !insertmacro MUI_PAGE_WELCOME ; License page !define MUI_LICENSEPAGE_RADIOBUTTONS -!insertmacro MUI_PAGE_LICENSE "C:\ink\inkscape\Copying" +!insertmacro MUI_PAGE_LICENSE "Copying" ; Directory page !insertmacro MUI_PAGE_DIRECTORY ; Instfiles page @@ -48,7 +48,7 @@
Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" -OutFile "Inkscape-0.38.1-1.win32.exe" +OutFile "Inkscape-0.40pre1-1.win32.exe" InstallDir "$PROGRAMFILES\Inkscape" InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" "" ShowInstDetails show @@ -73,12 +73,14 @@
MessageBox MB_YESNO|MB_ICONQUESTION "Do you want Inkscape to be the default SVG editor?" IDNO NoEditor WriteRegStr HKCR ".svg" "" "svgfile" + WriteRegStr HKCR ".svgz" "" "svgfile" WriteRegStr HKCR "svgfile" "" "Scalable Vector Graphics file" WriteRegStr HKCR "svgfile\shell\edit\command" "" '$INSTDIR\Inkscape.exe "%1"' NoEditor:
MessageBox MB_YESNO|MB_ICONQUESTION "Do you want Inkscape to be the default SVG reader?" IDNO NoReader WriteRegStr HKCR ".svg" "" "svgfile" + WriteRegStr HKCR ".svgz" "" "svgfile" WriteRegStr HKCR "svgfile" "" "Scalable Vector Graphics file" WriteRegStr HKCR "svgfile\shell\open\command" "" '$INSTDIR\Inkscape.exe "%1"' NoReader:
On Sun, Oct 31, 2004 at 12:47:18AM +0200, Adib Taraben wrote:
The version numbers are hardcoded in this file.
We could have a .nsi.in file with e.g.
!define PRODUCT_VERSION "@VERSION@"
and have a makefile rule, e.g. in Makefile.am:
inkscape.nsi: inkscape.nsi.in configure.ac sed 's,[@]VERSION[@],$(VERSION),g' < $(srcdir)/inkscape.nsi.in > inkscape.nsi
and perhaps add inkscape.nsi to EXTRA_DIST if we want people to be able to use the .nsi file without being able to use `make'.
Would this be helpful?
pjrm.
On Sun, Oct 31, 2004 at 04:22:47PM +1100, Peter Moulder wrote:
We could have a .nsi.in file with e.g.
!define PRODUCT_VERSION "@VERSION@"
I was thinking about that when I did the commit, actually. The inkscape.spec is built the same way.
and have a makefile rule, e.g. in Makefile.am:
inkscape.nsi: inkscape.nsi.in configure.ac sed 's,[@]VERSION[@],$(VERSION),g' < $(srcdir)/inkscape.nsi.in > inkscape.nsi
This can be done by adding "inkscape.nsi" with configure.ac's AC_CONFIG_FILES list.
and perhaps add inkscape.nsi to EXTRA_DIST if we want people to be able to use the .nsi file without being able to use `make'.
Oh! Yeah, good idea. Ah, yeah, I see the inkscape.spec is in there already. Cool.
Hi all,
I think that you are considering the wrong set of files. Since the Win32 build uses none of the autoconf/automake tree, this is likely the wrong place to put such a thing.
The Win32 build is performed with hand-made makefiles, and the Makedep perl scripts. A better place would be $INKSCAPE/Makefile.mingw, where the 'make dist' target already exists. Maybe add a target, 'make installer'.
However, even that might not be worth the effort. Over the last year, we have customized those Makefiles to work on Win9x, WinNT+, and Linux. Getting NSIS to run on all devices might be more trouble than it is worth. And for the last two releases, it was necessary to do some manual cleanup of the 'dist' directory, after it had been created, before running the NSIS packager. So it wouldn't be part of the set of target dependencies, without manual intervention. So, IMHO, it is not necessary to put it into the makefiles at all.
Bob
Kees Cook wrote:
On Sun, Oct 31, 2004 at 04:22:47PM +1100, Peter Moulder wrote:
We could have a .nsi.in file with e.g.
!define PRODUCT_VERSION "@VERSION@"
I was thinking about that when I did the commit, actually. The inkscape.spec is built the same way.
and have a makefile rule, e.g. in Makefile.am:
inkscape.nsi: inkscape.nsi.in configure.ac sed 's,[@]VERSION[@],$(VERSION),g' < $(srcdir)/inkscape.nsi.in > inkscape.nsi
This can be done by adding "inkscape.nsi" with configure.ac's AC_CONFIG_FILES list.
and perhaps add inkscape.nsi to EXTRA_DIST if we want people to be able to use the .nsi file without being able to use `make'.
Oh! Yeah, good idea. Ah, yeah, I see the inkscape.spec is in there already. Cool.
participants (5)
-
Adib Taraben -
Bob Jamison -
Kees Cook -
Peter Moulder -
Ted Gould