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

diff --git a/packaging/win32/portable/Other/Source/InkscapePortable.nsi b/packaging/win32/portable/Other/Source/InkscapePortable.nsi
index eef68adca393f3b82ecad4fa5fee1d6498aef255..c9081207d0b997056632924cf024a10c2ffa14d4 100644 (file)
--- 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\r
 ;Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.\r
 \r
+!define PORTABLEAPPNAME "Inkscape Portable"\r
 !define NAME InkscapePortable\r
 !define VER "1.6.6.0"\r
 !define LAUNCHERLANGUAGE English\r
 \r
 ;=== Program Details\r
-Name "Inkscape Portable"\r
+Name "${PORTABLEAPPNAME}"\r
 OutFile "..\..\${NAME}.exe"\r
 VIProductVersion "${VER}"\r
-VIAddVersionKey ProductName "Inkscape Portable"\r
+VIAddVersionKey ProductName "${PORTABLEAPPNAME}"\r
 VIAddVersionKey Comments "Allows Inkscape to be run from a removable drive.  For additional details, visit Inkscape.org"\r
 VIAddVersionKey CompanyName "PortableApps.com"\r
 VIAddVersionKey LegalCopyright "PortableApps.com & Inkscape.org"\r
-VIAddVersionKey FileDescription "Inkscape Portable"\r
+VIAddVersionKey FileDescription "${PORTABLEAPPNAME}"\r
 VIAddVersionKey FileVersion "${VER}"\r
 VIAddVersionKey ProductVersion "${VER}"\r
-VIAddVersionKey InternalName "Inkscape Portable"\r
+VIAddVersionKey InternalName "${PORTABLEAPPNAME}"\r
 VIAddVersionKey LegalTrademarks "PortableApps.com is a Trademark of Rare Ideas, LLC."\r
 VIAddVersionKey OriginalFilename "${NAME}.exe"\r
 ;VIAddVersionKey PrivateBuild ""\r
@@ -76,7 +77,6 @@ Icon "..\..\App\AppInfo\appicon.ico"
 LoadLanguageFile "${NSISDIR}\Contrib\Language files\${LAUNCHERLANGUAGE}.nlf"\r
 !include PortableApps.comLauncherLANG_${LAUNCHERLANGUAGE}.nsh\r
 \r
-Var EXECSTRING\r
 Var MISSINGFILEORPATH\r
 \r
 Section Main\r

diff --git a/packaging/win32/portable/readme.packaging.txt b/packaging/win32/portable/readme.packaging.txt
index 673ffc7360714db20e751818b9f03f2605bbe2d3..4067a4f8109d829abb8acfbba6323c936ef96951 100644 (file)
--- a/packaging/win32/portable/readme.packaging.txt
+++ b/packaging/win32/portable/readme.packaging.txt
@@ -1,29 +1,29 @@
-REQUIREMENTS\r
-============\r
-· Inkscape compiled (see http://wiki.inkscape.org/wiki/index.php/Win32Port)\r
-· NSIS Portable\r
-  http://portableapps.com/apps/development/nsis_portable\r
-  (or NSIS 2.45 or later [Windows 7 support] and the TextReplace plugin)\r
-· PortableApps.com AppCompactor\r
-  http://portableapps.com/apps/utilities/appcompactor\r
-· PortableApps.com Installer\r
-  http://portableapps.com/apps/development/portableapps.com_installer\r
-\r
-INSTRUCTIONS\r
-============\r
-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.\r
-\r
-(0. Compile Inkscape)\r
-1.  Copy everything from the "inkscape" build directory, EXCEPT for inkscape.dbg, into ./App/Inkscape\r
-2.  Update the version number in the "Version" section of ./App/AppInfo/appinfo.ini\r
-3.  Compile ./Other/Source/InkscapePortable.nsi with NSIS\r
-4.  Run the PortableApps.com AppCompactor on ./App/Inkscape\r
-5.  Run the PortableApps.com Installer on this directory\r
-\r
-6.  InkscapePortable_X.XX.paf.exe will now be in packaging/win32, ready for release\r
-7.  Test it (the installer and the installed)\r
-8.  Send it to John T. Haller of PortableApps.com for digital signature\r
-9.  Probably wait a few days...\r
-10. Receive it back, signed\r
-11. Test it again, just to make sure\r
-12. Release it!\r
+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!