On Tuesday, May 24, 2011 9:40:00 PM UTC+2, Henk Tijdink wrote:
>
> Have downloaded the new wrapper and it works now with 2011.0RC1.
> I have done some testing with the old wrapper with 2011Beta 2 and 3
> too and then the old wrapper still worked.
The change has come between Beta 3 and RC1.
>
I hadn't noticed this behavior with older versions either. The only purpose
of the wrapper is actually to reformat or get rid of parameters that are
hardcoded into Hugin. A nicer way would actually to be able to drop or
modify those hardcoded values. New parameters aren't automatically
understood by the wrapper, which is why it stopped working with this
release.
> The wrapper is not in an install package for windows. You have to
> download it separately as you have to do with smartblend.
> With Hugin is probably nothing wrong, but only the wrapper has to be
> adapted to a new extension in Hugin.
> But it should be nice if the wrapper and instructions for it is in the
> install package, so you can copy it to your smartblend folder.
>
Agreed. I don't have a Windows build environment setup, so I can't test it,
but the attached patch may solve this. It modifies1 and adds 1
CMakeLists.txt files, and changes to the Inno Setup (pre)release scripts are
made accordingly. Can someone with a working Windows build env test this?
(Allard, are you reading this?)
--
Bart
--
You received this message because you are subscribed to the Google Groups
"Hugin and other free panoramic software" group.
A list of frequently asked questions is available at:
http://wiki.panotools.org/Hugin_FAQ
To post to this group, send email to hugin-ptx@googlegroups.com
To unsubscribe from this group, send email to
hugin-ptx+unsubscr...@googlegroups.com
For more options, visit this group at http://groups.google.com/group/hugin-ptx
diff -r f00957574874 platforms/windows/CMakeLists.txt
--- a/platforms/windows/CMakeLists.txt Tue May 24 21:57:34 2011 +0200
+++ b/platforms/windows/CMakeLists.txt Wed May 25 01:21:47 2011 +0200
@@ -1,4 +1,5 @@
ADD_SUBDIRECTORY(droplets)
ADD_SUBDIRECTORY(installer)
-ADD_SUBDIRECTORY(huginsetup)
\ No newline at end of file
+ADD_SUBDIRECTORY(huginsetup)
+ADD_SUBDIRECTORY(smartblend-wrapper)
\ No newline at end of file
diff -r f00957574874 platforms/windows/installer/hugin_prerelease.iss
--- a/platforms/windows/installer/hugin_prerelease.iss Tue May 24 21:57:34 2011 +0200
+++ b/platforms/windows/installer/hugin_prerelease.iss Wed May 25 01:21:47 2011 +0200
@@ -1,6 +1,7 @@
; Hugin InnoSetup Installer File
; (C) 2008 Yuval Levy, licensed under GPL V2
; Minor adaptations 2009-2010 by Allard Katan
+; Smartblend-wrapper added 2011 by Bart van Andel
; if possible, let the Make process edit AppVerName to have a proper, automated SVN numbering
; make sure that the Make process copies this file from platforms/windows/msi to INSTALL/
; and that it also copes the files win_installer_readme.txt and win_release_notes.txt to INSTALL/
@@ -69,7 +70,7 @@
; Name: ap_c; Description: Autopano-SIFT-C (Patent issues in the USA!); Types: autopanoSIFT full custom
Name: matchpoint; Description: Matchpoint (EXPERIMENTAL control point generator); Types: full custom
Name: panotools; Description: Panotools Command Line Tools; Types: default full custom
-
+Name: smartblend; Description: Smartblend-wrapper; Types: default full custom
; not necessary (if the directory is not empty) but clean
[Dirs]
@@ -146,6 +147,9 @@
Source: FILES\bin\PTBatcher.exe; DestDir: {app}\bin; Components: core; Flags: overwritereadonly
Source: FILES\bin\PTBatcherGUI.exe; DestDir: {app}\bin; Components: core; Flags: overwritereadonly
+; smartblend wrapper
+Source: FILES\bin\smartblend-hugin.bat; DestDir: {app}\bin; Components: smartblend; Flags: overwritereadonly
+
; install redirect URL to welcome page
Source: url.txt; DestDir: {app}; DestName: test.url; Flags: deleteafterinstall; Attribs: hidden
@@ -155,6 +159,7 @@
Source: FILES\doc\enblend\*; DestDir: {app}\doc\enblend; Components: enblend; Flags: overwritereadonly recursesubdirs
Source: FILES\doc\hugin\*; DestDir: {app}\doc\hugin; Components: core; Flags: overwritereadonly recursesubdirs
Source: FILES\doc\panotools\*; DestDir: {app}\doc\panotools; Components: panotools; Flags: overwritereadonly recursesubdirs
+Source: FILES\doc\smartblend\*; DestDir: {app}\doc\smartblend; Components: smartblend; Flags: overwritereadonly recursesubdirs
; autopano docs
;Source: FILES\doc\autopano-sift-C\*; DestDir: {app}\doc\autopano-sift-C; Components: ap_c; Flags: overwritereadonly recursesubdirs
; hugin's UI and languages
diff -r f00957574874 platforms/windows/installer/hugin_release.iss
--- a/platforms/windows/installer/hugin_release.iss Tue May 24 21:57:34 2011 +0200
+++ b/platforms/windows/installer/hugin_release.iss Wed May 25 01:21:47 2011 +0200
@@ -1,6 +1,7 @@
; Hugin InnoSetup Installer File
; (C) 2008 Yuval Levy, licensed under GPL V2
; Minor adaptations 2009-2010 by Allard Katan