diff --git a/PythonLib/extra/_bsddb.pyd b/PythonLib/extra_dll/_bsddb.pyd similarity index 100% rename from PythonLib/extra/_bsddb.pyd rename to PythonLib/extra_dll/_bsddb.pyd diff --git a/PythonLib/extra_dll_x64/_bsddb.pyd b/PythonLib/extra_dll_x64/_bsddb.pyd new file mode 100644 index 00000000..05e2f94d Binary files /dev/null and b/PythonLib/extra_dll_x64/_bsddb.pyd differ diff --git a/PythonLib/full/_ctypes.pyd b/PythonLib/full_dll/_ctypes.pyd similarity index 100% rename from PythonLib/full/_ctypes.pyd rename to PythonLib/full_dll/_ctypes.pyd diff --git a/PythonLib/full/_elementtree.pyd b/PythonLib/full_dll/_elementtree.pyd similarity index 100% rename from PythonLib/full/_elementtree.pyd rename to PythonLib/full_dll/_elementtree.pyd diff --git a/PythonLib/full/_hashlib.pyd b/PythonLib/full_dll/_hashlib.pyd similarity index 100% rename from PythonLib/full/_hashlib.pyd rename to PythonLib/full_dll/_hashlib.pyd diff --git a/PythonLib/full/_msi.pyd b/PythonLib/full_dll/_msi.pyd similarity index 100% rename from PythonLib/full/_msi.pyd rename to PythonLib/full_dll/_msi.pyd diff --git a/PythonLib/full/_multiprocessing.pyd b/PythonLib/full_dll/_multiprocessing.pyd similarity index 100% rename from PythonLib/full/_multiprocessing.pyd rename to PythonLib/full_dll/_multiprocessing.pyd diff --git a/PythonLib/full/_sendkeys.pyd b/PythonLib/full_dll/_sendkeys.pyd similarity index 100% rename from PythonLib/full/_sendkeys.pyd rename to PythonLib/full_dll/_sendkeys.pyd diff --git a/PythonLib/full/_socket.pyd b/PythonLib/full_dll/_socket.pyd similarity index 100% rename from PythonLib/full/_socket.pyd rename to PythonLib/full_dll/_socket.pyd diff --git a/PythonLib/full/_sqlite3.pyd b/PythonLib/full_dll/_sqlite3.pyd similarity index 100% rename from PythonLib/full/_sqlite3.pyd rename to PythonLib/full_dll/_sqlite3.pyd diff --git a/PythonLib/full/_ssl.pyd b/PythonLib/full_dll/_ssl.pyd similarity index 100% rename from PythonLib/full/_ssl.pyd rename to PythonLib/full_dll/_ssl.pyd diff --git a/PythonLib/full/bz2.pyd b/PythonLib/full_dll/bz2.pyd similarity index 100% rename from PythonLib/full/bz2.pyd rename to PythonLib/full_dll/bz2.pyd diff --git a/PythonLib/full/pyexpat.pyd b/PythonLib/full_dll/pyexpat.pyd similarity index 100% rename from PythonLib/full/pyexpat.pyd rename to PythonLib/full_dll/pyexpat.pyd diff --git a/PythonLib/full/select.pyd b/PythonLib/full_dll/select.pyd similarity index 100% rename from PythonLib/full/select.pyd rename to PythonLib/full_dll/select.pyd diff --git a/PythonLib/full/unicodedata.pyd b/PythonLib/full_dll/unicodedata.pyd similarity index 100% rename from PythonLib/full/unicodedata.pyd rename to PythonLib/full_dll/unicodedata.pyd diff --git a/PythonLib/full/winsound.pyd b/PythonLib/full_dll/winsound.pyd similarity index 100% rename from PythonLib/full/winsound.pyd rename to PythonLib/full_dll/winsound.pyd diff --git a/PythonLib/full_dll_x64/_ctypes.pyd b/PythonLib/full_dll_x64/_ctypes.pyd new file mode 100644 index 00000000..8f832feb Binary files /dev/null and b/PythonLib/full_dll_x64/_ctypes.pyd differ diff --git a/PythonLib/full_dll_x64/_elementtree.pyd b/PythonLib/full_dll_x64/_elementtree.pyd new file mode 100644 index 00000000..aa1969a3 Binary files /dev/null and b/PythonLib/full_dll_x64/_elementtree.pyd differ diff --git a/PythonLib/full_dll_x64/_hashlib.pyd b/PythonLib/full_dll_x64/_hashlib.pyd new file mode 100644 index 00000000..fa50e6fa Binary files /dev/null and b/PythonLib/full_dll_x64/_hashlib.pyd differ diff --git a/PythonLib/full_dll_x64/_msi.pyd b/PythonLib/full_dll_x64/_msi.pyd new file mode 100644 index 00000000..07c4207f Binary files /dev/null and b/PythonLib/full_dll_x64/_msi.pyd differ diff --git a/PythonLib/full_dll_x64/_multiprocessing.pyd b/PythonLib/full_dll_x64/_multiprocessing.pyd new file mode 100644 index 00000000..03aaa6e7 Binary files /dev/null and b/PythonLib/full_dll_x64/_multiprocessing.pyd differ diff --git a/PythonLib/full_dll_x64/_socket.pyd b/PythonLib/full_dll_x64/_socket.pyd new file mode 100644 index 00000000..809b9d74 Binary files /dev/null and b/PythonLib/full_dll_x64/_socket.pyd differ diff --git a/PythonLib/full_dll_x64/_sqlite3.pyd b/PythonLib/full_dll_x64/_sqlite3.pyd new file mode 100644 index 00000000..31bd402a Binary files /dev/null and b/PythonLib/full_dll_x64/_sqlite3.pyd differ diff --git a/PythonLib/full_dll_x64/_ssl.pyd b/PythonLib/full_dll_x64/_ssl.pyd new file mode 100644 index 00000000..2a06a208 Binary files /dev/null and b/PythonLib/full_dll_x64/_ssl.pyd differ diff --git a/PythonLib/full_dll_x64/bz2.pyd b/PythonLib/full_dll_x64/bz2.pyd new file mode 100644 index 00000000..b9dd69b4 Binary files /dev/null and b/PythonLib/full_dll_x64/bz2.pyd differ diff --git a/PythonLib/full_dll_x64/pyexpat.pyd b/PythonLib/full_dll_x64/pyexpat.pyd new file mode 100644 index 00000000..1d9fe437 Binary files /dev/null and b/PythonLib/full_dll_x64/pyexpat.pyd differ diff --git a/PythonLib/full_dll_x64/select.pyd b/PythonLib/full_dll_x64/select.pyd new file mode 100644 index 00000000..e0db26ae Binary files /dev/null and b/PythonLib/full_dll_x64/select.pyd differ diff --git a/PythonLib/full_dll_x64/unicodedata.pyd b/PythonLib/full_dll_x64/unicodedata.pyd new file mode 100644 index 00000000..83ee3047 Binary files /dev/null and b/PythonLib/full_dll_x64/unicodedata.pyd differ diff --git a/PythonLib/full_dll_x64/winsound.pyd b/PythonLib/full_dll_x64/winsound.pyd new file mode 100644 index 00000000..40e95d35 Binary files /dev/null and b/PythonLib/full_dll_x64/winsound.pyd differ diff --git a/appveyor.yml b/appveyor.yml index 510264fc..85da61cb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -52,10 +52,10 @@ after_build: - cd "%APPVEYOR_BUILD_FOLDER%"\installer - set WIX_PATH="C:\Program Files (x86)\WiX Toolset v3.11\bin" - set PATH=%WIX_PATH%;%PATH% - - if "%platform_input%"=="x64" SET PYTHONBUILDDIR="%APPVEYOR_BUILD_FOLDER%"\packages\python2.2.7.14\tools + - if "%platform_input%"=="x64" SET PYTHONBUILDDIR_X64="%APPVEYOR_BUILD_FOLDER%"\packages\python2.2.7.14\tools - if "%platform_input%"=="Win32" SET PYTHONBUILDDIR="%APPVEYOR_BUILD_FOLDER%"\packages\python2x86.2.7.14\tools - copy "%APPVEYOR_BUILD_FOLDER%"\installer\buildPaths.bat.orig "%APPVEYOR_BUILD_FOLDER%"\installer\buildPaths.bat - - if "%platform_input%"=="Win32" if "%configuration%"=="Release" buildAll.bat + - if "%configuration%"=="Release" buildAll.bat %platform_input% - cd "%APPVEYOR_BUILD_FOLDER%" - ps: >- @@ -72,8 +72,8 @@ after_build: $ZipFileName = "PythonScript_$($env:APPVEYOR_REPO_TAG_NAME)_x64.zip" 7z a $ZipFileName $env:APPVEYOR_BUILD_FOLDER\$env:PLATFORM_INPUT\$env:CONFIGURATION\*.dll Push-AppveyorArtifact $ZipFileName -FileName $ZipFileName - #Get-ChildItem .\installer\build\**\*.msi | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name -DeploymentName releases} - #Get-ChildItem .\installer\build\**\*.zip | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name -DeploymentName releases} + Get-ChildItem .\installer\build\**\*.msi | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name -DeploymentName releases} + Get-ChildItem .\installer\build\**\*.zip | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name -DeploymentName releases} } if($env:PLATFORM_INPUT -eq "Win32"){ $ZipFileName = "PythonScript_$($env:APPVEYOR_REPO_TAG_NAME)_x86.zip" @@ -91,7 +91,7 @@ artifacts: deploy: provider: GitHub auth_token: - secure: !!TODO, see https://www.appveyor.com/docs/deployment/github/#provider-settings!! + secure: z5nuqsjm/L3HYsjSkMsVBH8EPAK17v3OOXzZDyp9hWx9J6Ff/gDYtbzWMoUtW0dI artifact: releases draft: false prerelease: false diff --git a/docs/source/compiling.rst b/docs/source/compiling.rst index 510b765d..db634dc3 100644 --- a/docs/source/compiling.rst +++ b/docs/source/compiling.rst @@ -60,7 +60,7 @@ Building PythonScript itself ---------------------------- Next step is to set the paths of where your boost and python libraries are. That's just a matter of setting the properties -in the .vsprops file - View, Other Windows, Property Manager in VS2010. Then set the macros in the User Macros section (under Debug and Release). +in the .vsprops file - View, Other Windows, Property Manager in VS2015. Then set the macros in the User Macros section (under Debug and Release). One last note on the code, a lot of the Python wrapper is automatically generated, with the CreateWrapper.py script. If you need to alter a Scintilla function, change the CreateWrapper.py script, not the generated code, or your changes will be lost next time CreateWrapper.py diff --git a/docs/source/conf.py b/docs/source/conf.py index d2b17045..a2bee069 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -40,7 +40,7 @@ # General information about the project. project = u'PythonScript' -copyright = u'2010,2014 Dave Brotherstone' +copyright = u'2010,2014,2018 Dave Brotherstone' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -232,7 +232,7 @@ epub_title = u'PythonScript' epub_author = u'Dave Brotherstone' epub_publisher = u'Dave Brotherstone' -epub_copyright = u'2010, Dave Brotherstone' +epub_copyright = u'2010,2014,2018 Dave Brotherstone' # The language of the text. It defaults to the language option # or en if the language is not set. diff --git a/docs/source/pythonprimer.rst b/docs/source/pythonprimer.rst index 19b7a0e1..90a30ec4 100644 --- a/docs/source/pythonprimer.rst +++ b/docs/source/pythonprimer.rst @@ -123,7 +123,7 @@ If you need to use ``\`` itself, just include two:: You can also use ``raw`` strings. These don't need the ``\\`` to mean ``\``, which can make certain strings (particularly regular expressions) easier to understand. However, you also can't escape a quote. To make a raw string, just put an ``r`` before the string - someString = r"this is also a string using a \ backslash" + someString = r"this is also a string using a \\ backslash" Further Information diff --git a/docs/source/usage.rst b/docs/source/usage.rst index 2e8b4c00..657a33aa 100644 --- a/docs/source/usage.rst +++ b/docs/source/usage.rst @@ -5,13 +5,13 @@ Installation ------------ Installation is very simple, either through Plugin Manager, or manually. The zip or 7zip archive contains the -the files in the correct layout - just copy to your Notepad++ directory (e.g. `c:\Program Files\Notepad++`) +the files in the correct layout - just copy to your Notepad++ directory (e.g. `c:\\Program Files\\Notepad++`) The file layout is as follows:: Notepad++ (your main Notepad++ directory, probably under "C:\Program Files") + - |-- python26.dll (this is important. This needs to go in the main program directory of Notepad++, next to notepad++.exe) + |-- python27.dll (this is important. This needs to go in the main program directory of Notepad++, next to notepad++.exe) | (unless you have a Python installation already, in which case it's probably in C:\windows already) +-- plugins \ diff --git a/installer/PythonScript.wxs b/installer/PythonScript.wxs index 875a4c14..6b0af3d7 100644 --- a/installer/PythonScript.wxs +++ b/installer/PythonScript.wxs @@ -49,7 +49,7 @@ - + diff --git a/installer/buildAll.bat b/installer/buildAll.bat index 3bec7c8b..cdbb6416 100644 --- a/installer/buildAll.bat +++ b/installer/buildAll.bat @@ -1,5 +1,5 @@ :: Run this script to put all the release packages together. :: You should have a built PythonScript in release mode, a built python, and all the libraries checked out -call buildInstaller.bat -call buildReleaseZips.bat +call buildInstaller.bat %1 +call buildReleaseZips.bat %1 diff --git a/installer/buildInstaller.bat b/installer/buildInstaller.bat index 3fd56772..e9f5aed2 100644 --- a/installer/buildInstaller.bat +++ b/installer/buildInstaller.bat @@ -14,8 +14,17 @@ IF NOT EXIST "buildPaths.bat" ( goto error ) +SET PYTHONSCRIPTDLLDIR=bin +SET INST_TEMP_DIR=temp +SET NAME_ADDON="" + CALL buildPaths.bat +IF "%1"=="x64" SET PYTHONBUILDDIR=%PYTHONBUILDDIR_X64% +IF "%1"=="x64" SET PYTHONSCRIPTDLLDIR=x64 +IF "%1"=="x64" SET INST_TEMP_DIR=temp64 +IF "%1"=="x64" SET NAME_ADDON=_x64 + IF NOT EXIST "%PYTHONBUILDDIR%\python.exe" ( echo Your PYTHONBUILDDIR in buildPaths.bat does not contain python.exe. Please set PYTHONBUILDDIR to the root of a built Python 2.7 goto error @@ -26,69 +35,93 @@ IF NOT EXIST "%PYTHONBUILDDIR%\python27.dll" ( goto error ) -mkdir temp +mkdir %INST_TEMP_DIR% -%PYTHONBUILDDIR%\python extractVersion.py > temp\version.txt -SET /p PYTHONSCRIPTVERSION= < temp\version.txt +%PYTHONBUILDDIR%\python extractVersion.py > %INST_TEMP_DIR%\version.txt +SET /p PYTHONSCRIPTVERSION= < %INST_TEMP_DIR%\version.txt echo Generating WiX information for ..\pythonlib\full -heat dir ..\pythonlib\full -ag -cg CG_PythonLib -dr D_PythonScript -var var.pylibSource -t changeDirLib.xsl -o temp\fullLib.wxs +heat dir ..\pythonlib\full -ag -cg CG_PythonLib -dr D_PythonScript -var var.pylibSource -t changeDirLib.xsl -o %INST_TEMP_DIR%\fullLib.wxs if NOT [%ERRORLEVEL%]==[0] ( goto error ) echo Compiling python lib WiX source -candle temp\fullLib.wxs -o temp\fullLib.wixobj -dpylibSource=..\pythonlib\full +candle %INST_TEMP_DIR%\fullLib.wxs -o %INST_TEMP_DIR%\fullLib.wixobj -dpylibSource=..\pythonlib\full +if NOT [%ERRORLEVEL%]==[0] ( + goto error +) + +echo Generating WiX information for ..\pythonlib\full_dll%NAME_ADDON% +heat dir ..\pythonlib\full_dll%NAME_ADDON% -ag -cg CG_PythonLib -dr D_PythonScript -var var.pylibSource -t changeDirLib.xsl -o %INST_TEMP_DIR%\fullLib_dll%NAME_ADDON%.wxs +if NOT [%ERRORLEVEL%]==[0] ( + goto error +) + +echo Compiling python pyd lib WiX source +candle %INST_TEMP_DIR%\fullLib_dll%NAME_ADDON%.wxs -o %INST_TEMP_DIR%\fullLib_dll%NAME_ADDON%.wixobj -dpylibSource=..\pythonlib\full_dll%NAME_ADDON% if NOT [%ERRORLEVEL%]==[0] ( goto error ) echo Generating WiX information for ..\pythonlib\extra -heat dir ..\pythonlib\extra -ag -cg CG_PythonExtraLib -dr D_PythonScript -var var.pylibSource -t changeDirLib.xsl -o temp\extra.wxs +heat dir ..\pythonlib\extra -ag -cg CG_PythonExtraLib -dr D_PythonScript -var var.pylibSource -t changeDirLib.xsl -o %INST_TEMP_DIR%\extra.wxs +if NOT [%ERRORLEVEL%]==[0] ( + goto error +) + +echo Compiling extra lib WiX source +candle %INST_TEMP_DIR%\extra.wxs -o %INST_TEMP_DIR%\extra.wixobj -dpylibSource=..\pythonlib\extra +if NOT [%ERRORLEVEL%]==[0] ( + goto error +) + +echo Generating WiX information for ..\pythonlib\extra_dll%NAME_ADDON% +heat dir ..\pythonlib\extra_dll%NAME_ADDON% -ag -cg CG_PythonExtraLib -dr D_PythonScript -var var.pylibSource -t changeDirLib.xsl -o %INST_TEMP_DIR%\extra_dll%NAME_ADDON%.wxs if NOT [%ERRORLEVEL%]==[0] ( goto error ) echo Compiling extra lib WiX source -candle temp\extra.wxs -o temp\extra.wixobj -dpylibSource=..\pythonlib\extra +candle %INST_TEMP_DIR%\extra_dll%NAME_ADDON%.wxs -o %INST_TEMP_DIR%\extra_dll%NAME_ADDON%.wixobj -dpylibSource=..\pythonlib\extra_dll%NAME_ADDON% if NOT [%ERRORLEVEL%]==[0] ( goto error ) echo Generating WiX information for ..\pythonlib\tcl -heat dir ..\pythonlib\tcl -ag -cg CG_PythonTclTkLib -dr D_PythonScript -var var.pylibSource -t changeDirLib.xsl -o temp\tcl.wxs +heat dir ..\pythonlib\tcl -ag -cg CG_PythonTclTkLib -dr D_PythonScript -var var.pylibSource -t changeDirLib.xsl -o %INST_TEMP_DIR%\tcl.wxs if NOT [%ERRORLEVEL%]==[0] ( goto error ) echo Compiling tcl lib WiX source -candle temp\tcl.wxs -o temp\tcl.wixobj -dpylibSource=..\pythonlib\tcl +candle %INST_TEMP_DIR%\tcl.wxs -o %INST_TEMP_DIR%\tcl.wixobj -dpylibSource=..\pythonlib\tcl 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 +heat dir ..\scripts\Samples -ag -cg CG_SampleScripts -dr D_PythonScript -var var.scriptSource -t changeDirSampleScripts.xsl -o %INST_TEMP_DIR%\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 +candle %INST_TEMP_DIR%\sampleScripts.wxs -o %INST_TEMP_DIR%\sampleScripts.wixobj -dscriptSource=..\scripts\Samples if NOT [%ERRORLEVEL%]==[0] ( goto error ) echo Generating WiX information for ..\PythonScript\python_tests -heat dir ..\PythonScript\python_tests -ag -cg CG_UnitTests -dr D_PythonScript -var var.unittestSource -t changeDirTests.xsl -o temp\unittests.wxs +heat dir ..\PythonScript\python_tests -ag -cg CG_UnitTests -dr D_PythonScript -var var.unittestSource -t changeDirTests.xsl -o %INST_TEMP_DIR%\unittests.wxs if NOT [%ERRORLEVEL%]==[0] ( goto error ) echo Compiling Unit test WiX source -candle temp\unittests.wxs -o temp\unittests.wixobj -dunittestSource=..\pythonscript\python_tests +candle %INST_TEMP_DIR%\unittests.wxs -o %INST_TEMP_DIR%\unittests.wixobj -dunittestSource=..\pythonscript\python_tests if NOT [%ERRORLEVEL%]==[0] ( goto error ) @@ -96,7 +129,7 @@ if NOT [%ERRORLEVEL%]==[0] ( echo Compiling main PythonScript installer -candle pythonscript.wxs -o temp\pythonscript.wixobj -dversion=%PYTHONSCRIPTVERSION% -dbaseDir=.. -dpythonDir=%PYTHONBUILDDIR% +candle pythonscript.wxs -o %INST_TEMP_DIR%\pythonscript.wixobj -dversion=%PYTHONSCRIPTVERSION% -dbaseDir=.. -dpythonDir=%PYTHONBUILDDIR% -dvariantDir=%PYTHONSCRIPTDLLDIR% if NOT [%ERRORLEVEL%]==[0] ( goto error ) @@ -108,14 +141,14 @@ IF NOT EXIST "build\%PYTHONSCRIPTVERSION%" ( ) -light temp\pythonscript.wixobj temp\fullLib.wixobj temp\extra.wixobj temp\unittests.wixobj temp\tcl.wixobj temp\sampleScripts.wixobj -o build\%PYTHONSCRIPTVERSION%\PythonScript_%PYTHONSCRIPTVERSION%.msi -ext WixUIExtension +light %INST_TEMP_DIR%\pythonscript.wixobj %INST_TEMP_DIR%\fullLib.wixobj %INST_TEMP_DIR%\extra.wixobj %INST_TEMP_DIR%\unittests.wixobj %INST_TEMP_DIR%\tcl.wixobj %INST_TEMP_DIR%\sampleScripts.wixobj -o build\%PYTHONSCRIPTVERSION%\PythonScript_%PYTHONSCRIPTVERSION%%NAME_ADDON%.msi -ext WixUIExtension if NOT [%ERRORLEVEL%]==[0] ( goto error ) echo. echo. -echo Installer created - build\%PYTHONSCRIPTVERSION%\PythonScript_%PYTHONSCRIPTVERSION%.msi +echo Installer created - build\%PYTHONSCRIPTVERSION%\PythonScript_%PYTHONSCRIPTVERSION%%NAME_ADDON%.msi goto end diff --git a/installer/buildPaths.bat.orig b/installer/buildPaths.bat.orig index c40b1921..4ae80942 100644 --- a/installer/buildPaths.bat.orig +++ b/installer/buildPaths.bat.orig @@ -2,4 +2,7 @@ IF [%PYTHONBUILDDIR%] == [] ( SET PYTHONBUILDDIR=l:\code\cpython\pcbuild +) +IF [%PYTHONBUILDDIR_X64%] == [] ( + SET PYTHONBUILDDIR_X64=l:\code\cpython\pcbuild_x64 ) \ No newline at end of file diff --git a/installer/buildReleaseZips.bat b/installer/buildReleaseZips.bat index 37494dc5..46d7fdec 100644 --- a/installer/buildReleaseZips.bat +++ b/installer/buildReleaseZips.bat @@ -13,8 +13,18 @@ IF NOT EXIST "buildPaths.bat" ( goto error ) +SET PYTHONSCRIPTDLLDIR=bin +SET INST_TEMP_DIR=temp +SET NAME_ADDON="" + CALL buildPaths.bat +IF "%1"=="x64" SET PYTHONBUILDDIR=%PYTHONBUILDDIR_X64% +IF "%1"=="x64" SET PYTHONSCRIPTDLLDIR=x64 +IF "%1"=="x64" SET INST_TEMP_DIR=temp64 +IF "%1"=="x64" SET NAME_ADDON=_x64 + + IF NOT EXIST "%PYTHONBUILDDIR%\python.exe" ( echo Your PYTHONBUILDDIR in buildPaths.bat does not contain python.exe. Please set PYTHONBUILDDIR to the root of a built Python 2.7 goto error @@ -31,9 +41,9 @@ IF EXIST "c:\program files\7-Zip\7z.exe" ( SET SEVENZIPEXE=7z.exe ) -mkdir temp +mkdir %INST_TEMP_DIR% -%SEVENZIPEXE% 2>&1 > temp\junk.txt +%SEVENZIPEXE% 2>&1 > %INST_TEMP_DIR%\junk.txt IF NOT [%ERRORLEVEL%]==[0] ( echo Your 7z.exe doesn't seem to be in your PATH or in c:\program files\7-Zip, either add it to your path or install it @@ -45,71 +55,73 @@ IF NOT [%ERRORLEVEL%]==[0] ( -%PYTHONBUILDDIR%\python extractVersion.py > temp\version.txt -SET /p PYTHONSCRIPTVERSION= < temp\version.txt +%PYTHONBUILDDIR%\python extractVersion.py > %INST_TEMP_DIR%\version.txt +SET /p PYTHONSCRIPTVERSION= < %INST_TEMP_DIR%\version.txt echo Building Release for version %PYTHONSCRIPTVERSION% echo. echo Clearing old release directory -rd /s /q temp\release +rd /s /q %INST_TEMP_DIR%\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 +mkdir %INST_TEMP_DIR%\release\Full\plugins\PythonScript\lib +mkdir %INST_TEMP_DIR%\release\Full\plugins\PythonScript\scripts +mkdir %INST_TEMP_DIR%\release\Full\plugins\doc\PythonScript +mkdir %INST_TEMP_DIR%\release\Min\plugins\PythonScript\lib +mkdir %INST_TEMP_DIR%\release\Min\plugins\PythonScript\scripts +mkdir %INST_TEMP_DIR%\release\Min\plugins\doc\PythonScript +mkdir %INST_TEMP_DIR%\release\Extra\plugins\PythonScript\lib +mkdir %INST_TEMP_DIR%\release\Tcl\plugins\PythonScript\lib\tcl echo Copying Python27.dll -copy %PYTHONBUILDDIR%\python27.dll temp\release\Full -copy %PYTHONBUILDDIR%\python27.dll temp\release\Min +copy %PYTHONBUILDDIR%\python27.dll %INST_TEMP_DIR%\release\Full +copy %PYTHONBUILDDIR%\python27.dll %INST_TEMP_DIR%\release\Min echo Copying PythonScript.dll -copy ..\bin\Release\PythonScript.dll temp\release\Full\plugins -copy ..\bin\release\PythonScript.dll temp\release\min\plugins +copy ..\%PYTHONSCRIPTDLLDIR%\release\PythonScript.dll %INST_TEMP_DIR%\release\Full\plugins +copy ..\%PYTHONSCRIPTDLLDIR%\release\PythonScript.dll %INST_TEMP_DIR%\release\min\plugins 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 +copy ..\docs\build\htmlhelp\PythonScript.chm %INST_TEMP_DIR%\release\full\plugins\doc\PythonScript +copy ..\docs\build\htmlhelp\PythonScript.chm %INST_TEMP_DIR%\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 +xcopy /s /q ..\scripts\*.* %INST_TEMP_DIR%\release\full\plugins\PythonScript\scripts +copy ..\scripts\startup.py %INST_TEMP_DIR%\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 +xcopy /s /q ..\PythonLib\full\*.* %INST_TEMP_DIR%\release\full\plugins\PythonScript\lib +xcopy /s /q ..\PythonLib\full_dll%NAME_ADDON%\*.* %INST_TEMP_DIR%\release\full\plugins\PythonScript\lib +xcopy /s /q ..\PythonLib\min\*.* %INST_TEMP_DIR%\release\min\plugins\PythonScript\lib echo Copying Extra lib directory -xcopy /s /q ..\PythonLib\Extra\*.* temp\release\extra\plugins\pythonscript\lib +xcopy /s /q ..\PythonLib\extra\*.* %INST_TEMP_DIR%\release\extra\plugins\pythonscript\lib +xcopy /s /q ..\PythonLib\extra_dll%NAME_ADDON%\*.* %INST_TEMP_DIR%\release\extra\plugins\pythonscript\lib echo Copying Tcl directory -xcopy /s /q ..\PythonLib\tcl\*.* temp\release\tcl\plugins\pythonscript\lib\tcl +xcopy /s /q ..\PythonLib\tcl\*.* %INST_TEMP_DIR%\release\tcl\plugins\pythonscript\lib\tcl -cd temp\release\Full +cd %INST_TEMP_DIR%\release\Full mkdir %INSTALLERDIR%\build\%PYTHONSCRIPTVERSION% -%SEVENZIPEXE% a -r -t7z %INSTALLERDIR%\build\%PYTHONSCRIPTVERSION%\PythonScript_Full_%PYTHONSCRIPTVERSION%.7z . -%SEVENZIPEXE% a -r -tzip %INSTALLERDIR%\build\%PYTHONSCRIPTVERSION%\PythonScript_Full_%PYTHONSCRIPTVERSION%.zip . +%SEVENZIPEXE% a -r -t7z %INSTALLERDIR%\build\%PYTHONSCRIPTVERSION%\PythonScript_Full_%PYTHONSCRIPTVERSION%%NAME_ADDON%.7z . +%SEVENZIPEXE% a -r -tzip %INSTALLERDIR%\build\%PYTHONSCRIPTVERSION%\PythonScript_Full_%PYTHONSCRIPTVERSION%%NAME_ADDON%.zip . -cd %INSTALLERDIR%\temp\release\Min -%SEVENZIPEXE% a -r -t7z %INSTALLERDIR%\build\%PYTHONSCRIPTVERSION%\PythonScript_Min_%PYTHONSCRIPTVERSION%.7z . -%SEVENZIPEXE% a -r -tzip %INSTALLERDIR%\build\%PYTHONSCRIPTVERSION%\PythonScript_Min_%PYTHONSCRIPTVERSION%.zip . +cd %INSTALLERDIR%\%INST_TEMP_DIR%\release\Min +%SEVENZIPEXE% a -r -t7z %INSTALLERDIR%\build\%PYTHONSCRIPTVERSION%\PythonScript_Min_%PYTHONSCRIPTVERSION%%NAME_ADDON%.7z . +%SEVENZIPEXE% a -r -tzip %INSTALLERDIR%\build\%PYTHONSCRIPTVERSION%\PythonScript_Min_%PYTHONSCRIPTVERSION%%NAME_ADDON%.zip . -cd %INSTALLERDIR%\temp\release\Extra -%SEVENZIPEXE% a -r -t7z %INSTALLERDIR%\build\%PYTHONSCRIPTVERSION%\PythonScript_ExtraLibs_%PYTHONSCRIPTVERSION%.7z . -%SEVENZIPEXE% a -r -tzip %INSTALLERDIR%\build\%PYTHONSCRIPTVERSION%\PythonScript_ExtraLibs_%PYTHONSCRIPTVERSION%.zip . +cd %INSTALLERDIR%\%INST_TEMP_DIR%\release\Extra +%SEVENZIPEXE% a -r -t7z %INSTALLERDIR%\build\%PYTHONSCRIPTVERSION%\PythonScript_ExtraLibs_%PYTHONSCRIPTVERSION%%NAME_ADDON%.7z . +%SEVENZIPEXE% a -r -tzip %INSTALLERDIR%\build\%PYTHONSCRIPTVERSION%\PythonScript_ExtraLibs_%PYTHONSCRIPTVERSION%%NAME_ADDON%.zip . -cd %INSTALLERDIR%\temp\release\Tcl -%SEVENZIPEXE% a -r -t7z %INSTALLERDIR%\build\%PYTHONSCRIPTVERSION%\PythonScript_TclTk_%PYTHONSCRIPTVERSION%.7z . -%SEVENZIPEXE% a -r -tzip %INSTALLERDIR%\build\%PYTHONSCRIPTVERSION%\PythonScript_TclTk_%PYTHONSCRIPTVERSION%.zip . +cd %INSTALLERDIR%\%INST_TEMP_DIR%\release\Tcl +%SEVENZIPEXE% a -r -t7z %INSTALLERDIR%\build\%PYTHONSCRIPTVERSION%\PythonScript_TclTk_%PYTHONSCRIPTVERSION%%NAME_ADDON%.7z . +%SEVENZIPEXE% a -r -tzip %INSTALLERDIR%\build\%PYTHONSCRIPTVERSION%\PythonScript_TclTk_%PYTHONSCRIPTVERSION%%NAME_ADDON%.zip . -%SEVENZIPEXE% a -t7z %INSTALLERDIR%\build\%PYTHONSCRIPTVERSION%\PythonScript_PDB_%PYTHONSCRIPTVERSION%.7z %INSTALLERDIR%\..\bin\release\PythonScript.pdb +%SEVENZIPEXE% a -t7z %INSTALLERDIR%\build\%PYTHONSCRIPTVERSION%\PythonScript_PDB_%PYTHONSCRIPTVERSION%%NAME_ADDON%.7z %INSTALLERDIR%\..\%PYTHONSCRIPTDLLDIR%\release\PythonScript.pdb echo Updating local download webpage echo ^