Re: [hugin-ptx] Re: Smartblend Wrapper Fixed - 2011.0.0_RC2 will follow

2011-05-26 Thread Yuval Levy
Hello Henk,

On May 24, 2011 03:40:00 pm Henk Tijdink wrote:
> Have downloaded the new wrapper and it works now with 2011.0RC1.

Thanks for confirming.  I have released RC2.


> 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.

Matthew Petroff maintains the Windows installer, you may want to file a 
feature request / discuss this with him.

Yuv


signature.asc
Description: This is a digitally signed message part.


Re: [hugin-ptx] Re: Smartblend Wrapper Fixed - 2011.0.0_RC2 will follow

2011-05-26 Thread Yuval Levy
On May 24, 2011 07:25:12 pm Bart van Andel wrote:
> 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?)

AFAIK the InnoSetup scripts are outdated/unmaintained since Matthew 
contributed the NSI based installer at /platforms/windows/huginsetup

Yuv


signature.asc
Description: This is a digitally signed message part.


[hugin-ptx] Re: Smartblend Wrapper Fixed - 2011.0.0_RC2 will follow

2011-05-24 Thread Bart van Andel
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

[hugin-ptx] Re: Smartblend Wrapper Fixed - 2011.0.0_RC2 will follow

2011-05-24 Thread Henk Tijdink
Hello Yuv

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.
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.

Kind regards,
Henk Tijdink
On May 24, 2:11 pm, Yuval Levy  wrote:
> Hi all,
>
> Bart van Andel fixed the smartblend wrapper in the repository.
>
> Windows users confronted with the issue (Henk?): can you please download the
> updated wrapper from [0], overwrite the smartblend-hugin.bat of 2011.0.0_RC1
> and test that it works?
>
> Once I have confirmation that it works, I will apply the changeset to the
> 2011.0 branch and issue an RC2.
>
> Since this affects Windows only, and it is only a script, "final" status can
> be declared soon thereafter.  It is enough to confirm that the bug is fixed on
> Windows and that the tarball builds on Linux and Mac.  Harry: do you (still)
> want to be the one declaring this upcoming RC2 final?
>
> Linux/Unix/Mac end-users need not bother with this.
>
> Yuv
>
> [0]http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/raw-
> file/cd9cb5ee3f3b/platforms/windows/smartblend-wrapper/smartblend-hugin.bat
>
> --  Forwarded Message  --
>
> Subject: [Hugin-cvs] /hgrepo/h/hu/hugin/hugin: Fix smartblend-hugin.bat to
> remove '--...
> Date: May 24, 2011, 07:40:40 AM
> From: hugin-...@lists.sourceforge.net
> To: hugin-...@lists.sourceforge.net
>
> branch:    
> details:  
> http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/h...
> changeset: 5238:cd9cb5ee3f3b
> user:      Bart van Andel bavanandel+c...@gmail.com
> date:       Tue May 24 13:27:26 2011 +0200
> description:
> Fix smartblend-hugin.bat to remove '--' argument separator
>
> diffstat:
>
>  platforms/windows/smartblend-wrapper/smartblend-hugin.bat |  2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
>
> diffs (12 lines):
>
> diff -r 967c53582af3 -r cd9cb5ee3f3b platforms/windows/smartblend-
> wrapper/smartblend-hugin.bat
> --- a/platforms/windows/smartblend-wrapper/smartblend-hugin.bat Tue May 24
> 08:50:29 2011 +0200
> +++ b/platforms/windows/smartblend-wrapper/smartblend-hugin.bat Tue May 24
> 13:27:26 2011 +0200
> @@ -16,6 +16,8 @@
>                 shift
>         ) else if "%arg:~0,2%"=="-f" (
>                 echo [smartblend-wrapper] Skipping crop argument: %1
> +       ) else if "%arg:~0,2%"=="--" (
> +               echo [smartblend-wrapper] Skipping argument separator: %1
>         ) else if "%arg:~0,2%"=="-o" (
>                 echo [smartblend-wrapper] Output file: %2
>                 set SMARTBLENDARGS=%SMARTBLENDARGS% -o %2
> -
>
>  signature.asc
> < 1KViewDownload

-- 
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