Updates from Chris Morgan to avoid warning in the nsi and clarify something in the readme.

(bzr r8777)

2 files changed, 34 insertions, 34 deletions

diff --git a/packaging/win32/portable/Other/Source/InkscapePortable.nsi b/packaging/win32/portable/Other/Source/InkscapePortable.nsi
index eef68adca..c9081207d 100644
--- a/packaging/win32/portable/Other/Source/InkscapePortable.nsi
+++ b/packaging/win32/portable/Other/Source/InkscapePortable.nsi
@@ -20,22 +20,23 @@
 ;along with this program; if not, write to the Free Software

 ;Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.

 

+!define PORTABLEAPPNAME "Inkscape Portable"

 !define NAME InkscapePortable

 !define VER "1.6.6.0"

 !define LAUNCHERLANGUAGE English

 

 ;=== Program Details

-Name "Inkscape Portable"

+Name "${PORTABLEAPPNAME}"

 OutFile "..\..\${NAME}.exe"

 VIProductVersion "${VER}"

-VIAddVersionKey ProductName "Inkscape Portable"

+VIAddVersionKey ProductName "${PORTABLEAPPNAME}"

 VIAddVersionKey Comments "Allows Inkscape to be run from a removable drive.  For additional details, visit Inkscape.org"

 VIAddVersionKey CompanyName "PortableApps.com"

 VIAddVersionKey LegalCopyright "PortableApps.com & Inkscape.org"

-VIAddVersionKey FileDescription "Inkscape Portable"

+VIAddVersionKey FileDescription "${PORTABLEAPPNAME}"

 VIAddVersionKey FileVersion "${VER}"

 VIAddVersionKey ProductVersion "${VER}"

-VIAddVersionKey InternalName "Inkscape Portable"

+VIAddVersionKey InternalName "${PORTABLEAPPNAME}"

 VIAddVersionKey LegalTrademarks "PortableApps.com is a Trademark of Rare Ideas, LLC."

 VIAddVersionKey OriginalFilename "${NAME}.exe"

 ;VIAddVersionKey PrivateBuild ""

@@ -76,7 +77,6 @@ Icon "..\..\App\AppInfo\appicon.ico"
 LoadLanguageFile "${NSISDIR}\Contrib\Language files\${LAUNCHERLANGUAGE}.nlf"

 !include PortableApps.comLauncherLANG_${LAUNCHERLANGUAGE}.nsh

 

-Var EXECSTRING

 Var MISSINGFILEORPATH

 

 Section Main

diff --git a/packaging/win32/portable/readme.packaging.txt b/packaging/win32/portable/readme.packaging.txt
index 673ffc736..4067a4f81 100644
--- a/packaging/win32/portable/readme.packaging.txt
+++ b/packaging/win32/portable/readme.packaging.txt
@@ -1,29 +1,29 @@
-REQUIREMENTS

-============

-· Inkscape compiled (see http://wiki.inkscape.org/wiki/index.php/Win32Port)

-· NSIS Portable

-  http://portableapps.com/apps/development/nsis_portable

-  (or NSIS 2.45 or later [Windows 7 support] and the TextReplace plugin)

-· PortableApps.com AppCompactor

-  http://portableapps.com/apps/utilities/appcompactor

-· PortableApps.com Installer

-  http://portableapps.com/apps/development/portableapps.com_installer

-

-INSTRUCTIONS

-============

-An automated version is planned for later, but currently you'll just have to follow these instructions.  Oh, and it won't do the last half dozen steps automatically.

-

-(0. Compile Inkscape)

-1.  Copy everything from the "inkscape" build directory, EXCEPT for inkscape.dbg, into ./App/Inkscape

-2.  Update the version number in the "Version" section of ./App/AppInfo/appinfo.ini

-3.  Compile ./Other/Source/InkscapePortable.nsi with NSIS

-4.  Run the PortableApps.com AppCompactor on ./App/Inkscape

-5.  Run the PortableApps.com Installer on this directory

-

-6.  InkscapePortable_X.XX.paf.exe will now be in packaging/win32, ready for release

-7.  Test it (the installer and the installed)

-8.  Send it to John T. Haller of PortableApps.com for digital signature

-9.  Probably wait a few days...

-10. Receive it back, signed

-11. Test it again, just to make sure

-12. Release it!

+REQUIREMENTS
+============
+· Inkscape compiled (see http://wiki.inkscape.org/wiki/index.php/Win32Port)
+· NSIS Portable
+  http://portableapps.com/apps/development/nsis_portable
+  (or NSIS 2.45 or later [Windows 7 support] and the TextReplace plugin)
+· PortableApps.com AppCompactor
+  http://portableapps.com/apps/utilities/appcompactor
+· PortableApps.com Installer
+  http://portableapps.com/apps/development/portableapps.com_installer
+
+INSTRUCTIONS
+============
+An automated version is planned for later, but currently you'll just have to follow these instructions.  Oh, and it won't do the last half dozen steps automatically.
+
+(0. Compile Inkscape)
+1.  Copy everything from the "inkscape" build directory, EXCEPT for inkscape.dbg and gdb.exe, into ./App/Inkscape
+2.  Update the version number in the "Version" section of ./App/AppInfo/appinfo.ini
+3.  Compile ./Other/Source/InkscapePortable.nsi with NSIS
+4.  Run the PortableApps.com AppCompactor on ./App/Inkscape
+5.  Run the PortableApps.com Installer on this directory
+
+6.  InkscapePortable_X.XX.paf.exe will now be in packaging/win32, ready for release
+7.  Test it (the installer and the installed)
+8.  Send it to John T. Haller of PortableApps.com for digital signature
+9.  Probably wait a few days...
+10. Receive it back, signed
+11. Test it again, just to make sure
+12. Release it!