Add sample scripts to installer and zip releases

Author: bruderstein

PythonScript/src/PythonScriptVersion.h

@@ -1,7 +1,7 @@
 #ifndef _PYTHONSCRIPTVERSION_H
 #define _PYTHONSCRIPTVERSION_H
 
-#define PYSCR_VERSION_NUMERIC 1,0,0,0
-#define PYSCR_VERSION_STRING "1.0.0.0"
+#define PYSCR_VERSION_NUMERIC 1,0,0,1
+#define PYSCR_VERSION_STRING "1.0.0.1"
 
 #endif

installer/PythonScript.wxs

@@ -36,6 +36,7 @@
 									<File Id="F_startup.py" KeyPath="yes" Name="startup.py" Source="$(var.baseDir)\scripts\startup.py" />
 								</Component>
 								<Directory Id="D_npp_unit_tests" Name="npp_unit_tests" />
+								<Directory Id="D_SampleScripts" Name="Samples" />
 							</Directory>
 						</Directory>
 						<Directory Id="D_doc" Name="doc">
@@ -70,6 +71,9 @@
 			<Feature Id="FT_Help" Title="Help" AllowAdvertise="no" Description="CHM file with documentation for all the classes, methods and enums in PythonScript">
 				<ComponentRef Id="C_PythonScript.chm" />
 			</Feature>
+			<Feature Id="FT_SampleScripts" Title="Sample Scripts" AllowAdvertise="no" Description="Sample scripts to show basic usage">
+				<ComponentGroupRef Id="CG_SampleScripts" />
+			</Feature>
 			<Feature Id="FT_ExtraLibs" Title="Extra Libraries" Level="10" AllowAdvertise="no" Description="distutils, lib2to3 and bsddb support">
 				<ComponentGroupRef Id="CG_PythonExtraLib" />
 			</Feature>

installer/buildInstaller.bat

@@ -66,6 +66,17 @@ if NOT [%ERRORLEVEL%]==[0] (
  goto error
 )
 
+echo Generating WiX information for ..\PythonScript\scripts\Samples
+heat dir ..\scripts\Samples -ag -cg CG_SampleScripts -dr D_PythonScript -var var.scriptSource -t changeDirSampleScripts.xsl -o temp\sampleScripts.wxs
+if NOT [%ERRORLEVEL%]==[0] (
+ goto error
+)
+
+echo Compiling Sample Scripts WiX source
+candle temp\sampleScripts.wxs -o temp\sampleScripts.wixobj -dscriptSource=..\scripts\Samples
+if NOT [%ERRORLEVEL%]==[0] (
+ goto error
+)
 
 
 echo Generating WiX information for ..\PythonScript\python_tests
@@ -90,7 +101,7 @@ if NOT [%ERRORLEVEL%]==[0] (
 
 
 echo Linking installer - generating MSI
-light temp\pythonscript.wixobj temp\fullLib.wixobj temp\extra.wixobj temp\unittests.wixobj temp\tcl.wixobj -o build\PythonScript_%PYTHONSCRIPTVERSION%.msi -ext WixUIExtension
+light temp\pythonscript.wixobj temp\fullLib.wixobj temp\extra.wixobj temp\unittests.wixobj temp\tcl.wixobj temp\sampleScripts.wixobj -o build\PythonScript_%PYTHONSCRIPTVERSION%.msi -ext WixUIExtension
 if NOT [%ERRORLEVEL%]==[0] (
  goto error
 )

installer/buildReleaseZips.bat

@@ -54,8 +54,10 @@ rd /s /q temp\release
 
 echo Creating directories
 mkdir temp\release\Full\plugins\PythonScript\lib
+mkdir temp\release\Full\plugins\PythonScript\scripts
 mkdir temp\release\Full\plugins\doc\PythonScript
 mkdir temp\release\Min\plugins\PythonScript\lib
+mkdir temp\release\Min\plugins\PythonScript\scripts
 mkdir temp\release\Min\plugins\doc\PythonScript
 mkdir temp\release\Extra\plugins\PythonScript\lib
 mkdir temp\release\Tcl\plugins\PythonScript\lib\tcl
@@ -72,6 +74,10 @@ echo Copying Help
 copy ..\docs\build\htmlhelp\PythonScript.chm temp\release\full\plugins\doc\PythonScript
 copy ..\docs\build\htmlhelp\PythonScript.chm temp\release\min\plugins\doc\PythonScript
 
+echo Copying Scripts
+xcopy /s /q ..\scripts\*.* temp\release\full\plugins\PythonScript\scripts
+copy ..\scripts\startup.py temp\release\min\plugins\PythonScript\scripts
+
 echo Copying Lib directories
 xcopy /s /q ..\PythonLib\full\*.* temp\release\full\plugins\PythonScript\lib
 xcopy /s /q ..\PythonLib\min\*.* temp\release\min\plugins\PythonScript\lib

installer/changeDirSampleScripts.xsl

@@ -0,0 +1,7 @@
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:wix="http://schemas.microsoft.com/wix/2006/wi" version="1.0">
+
+	<xsl:output method="xml" indent="yes" />
+	<xsl:param name="realDirectoryId" select="'D_SampleScripts'" />
+	<xsl:include href="fixDirectoryAndFileRefs.xsl" />
+
+</xsl:stylesheet>

scripts/Samples/Python Regex Replacements.py

@@ -10,12 +10,12 @@
 # so ABDABD, DEFDEF or DGBDGB etc. the first 3 characters, 
 # so ABD, DEF and DGB in these cases.
 
-editor.pyreplace(r"([A-Z]{3})\1", r"\1")
+editor.rereplace(r"([A-Z]{3})\1", r"\1")
 
 # Do a multi-line Python regular expression replace.
 
 # This example replaces any <br/> that is followed by another on the next line (with optional spaces in between), with a single one
-editor.pymlreplace(r"<br/>\s*\r\n\s*<br/>", "<br/>\r\n")
+editor.rereplace(r"<br/>\s*\r\n\s*<br/>", "<br/>\r\n")
 
 
 # End the undo action, so Ctrl-Z will undo the above two actions

scripts/Samples/Remove and Modify selected lines.py

@@ -11,7 +11,7 @@ def testContents(contents, lineNumber, totalLines):
                 editor.replaceLine(lineNumber, "something new")
 
         elif contents.strip() == "little something":
-                editor.replaceLine(lineNumber, "BIG\nSOMETHING"
+                editor.replaceLine(lineNumber, "BIG\nSOMETHING")
                 # Here we return 2, as we've inserted a newline,
                 # and we don't want to test the "SOMETHING" line again
                 return 2