Skip to content

Commit

Permalink
Version 1.0.2.0
Browse files Browse the repository at this point in the history 
Fixed hard coded path in docs build process
  • Loading branch information
@bruderstein
bruderstein committed Mar 30, 2014
1 parent e0a8fc7 commit 650ef89
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 27 deletions.
4 changes: 2 additions & 2 deletions PythonScript/src/PythonScriptVersion.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef _PYTHONSCRIPTVERSION_H
#define _PYTHONSCRIPTVERSION_H

#define PYSCR_VERSION_NUMERIC 1,0,1,0
#define PYSCR_VERSION_STRING "1.0.1.0"
#define PYSCR_VERSION_NUMERIC 1,0,2,0
#define PYSCR_VERSION_STRING "1.0.2.0"

#endif
7 changes: 3 additions & 4 deletions docs/source/conf.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
# serve to show the default.

import sys, os, re

# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
Expand Down Expand Up @@ -41,15 +40,15 @@

# General information about the project.
project = u'PythonScript'
copyright = u'2010, Dave Brotherstone'
copyright = u'2010,2014 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
# built documents.
#
# The short X.Y version.
pyscr_base = r"E:\work\PythonScript"
version_file = open(pyscr_base + r"\PythonScript\src\PythonScriptVersion.h")
pyscr_version_file = os.path.join(os.path.abspath(os.path.dirname(__file__)), r'..\..\PythonScript\src\PythonScriptVersion.h')
version_file = open(pyscr_version_file)
version_contents = version_file.read()
version_file.close()
match = re.search(r'#define PYSCR_VERSION_STRING "([0-9.]+)"', version_contents)
Expand Down
5 changes: 5 additions & 0 deletions www/changelog.shtml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
<!--#include virtual="header.inc" -->
<h3>Change log:</h3>
<br/>
<b>1.0.2.0</b>
<ul>
<li>Fixed bug with Editor.rereplace that stopped conditional replacements working (thanks to Cyrillev for reporting)</li>
</ul>
<br/>
<b>1.0.1.0</b>
<ul>
<li>Editor.pyreplace and similar methods (Editor.pysearch, Editor.pymlreplace) have been rewritten from the ground up. Editor.replace(), Editor.rereplace(), Editor.search() and the unfortunately named Editor.research() (R(egular)E(xpression)Search) methods replace the old functions completely. You can now use a function for the replace argument for editor.replace() and editor.rereplace(). The new functions are <strong>much</strong> faster than the old versions, and work reliably.</li>
Expand Down
2 changes: 1 addition & 1 deletion www/download.shtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ There's no difference between the zip and the 7zip versions, just that the 7zip
<br/><br/>
There are two download locations - the primary one is <a href="http://sourceforge.net/projects/npppythonscript/files">here</a>, and the backup is <a href="localdl.shtml">here</a>
h
<h3><a href="http://sourceforge.net/projects/npppythonscript/files/Python%20Script%201.0.1.0/PythonScript_1.0.1.0.msi/download">Download the MSI</a>, or <a href="https://sourceforge.net/projects/npppythonscript/files/">go to the downloads</a> to choose a zipped version</a></h3>
<h3><a href="http://sourceforge.net/projects/npppythonscript/files/Python%20Script%201.0.2.0/PythonScript_1.0.2.0.msi/download">Download the MSI</a>, or <a href="https://sourceforge.net/projects/npppythonscript/files/">go to the downloads</a> to choose a zipped version</a></h3>

<br/>
<br/>
Expand Down
2 changes: 1 addition & 1 deletion www/header.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<br/>
<br/>
<br/>
Latest Version: 1.0.1.0
Latest Version: 1.0.2.0
<br/>
<br/>
<br/>
Expand Down
34 changes: 15 additions & 19 deletions www/localdl.shtml
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
<!--#include virtual="header.inc" -->

<h3>Local Download</h3>
Here are the local server links if you can't get to <a href="http://sourceforge.net/projects/npppythonscript/files">the main one at sourceforge</a>.
Please use the sourceforge link if you can - I have limited bandwidth limits.
<br/><br/><br/>
<br/><a href="http://www.brotherstone.co.uk/npp/ps/downloads/PythonScript_1.0.1.0.msi">Python Script 1.0.1.0 Installer (includes all extra files) (11MB)</a>
<br/><a href="http://www.brotherstone.co.uk/npp/ps/downloads/PythonScript_Full_1.0.1.0.7z">Python Script 1.0.1.0 FULL 7zip version (3.3MB)</a>
<br/><a href="http://www.brotherstone.co.uk/npp/ps/downloads/PythonScript_Full_1.0.1.0.zip">Python Script 1.0.1.0 FULL zip version (5MB)</a>
<br/><a href="http://www.brotherstone.co.uk/npp/ps/downloads/PythonScript_Min_1.0.1.0.7z">Python Script 1.0.1.0 MINIMUM 7zip version (2.3MB)</a>
<br/><a href="http://www.brotherstone.co.uk/npp/ps/downloads/PythonScript_Min_1.0.1.0.zip">Python Script 1.0.1.0 MINIMUM zip version (3.2MB)</a>

<br/><a href="http://www.brotherstone.co.uk/npp/ps/downloads/PythonScript_ExtraLibs_1.0.1.0.7z">Extra libraries 7z(900KB)</a>
<br/><a href="http://www.brotherstone.co.uk/npp/ps/downloads/PythonScript_ExtraLibs_1.0.1.0.zip">Extra libraries zip(1.2MB)</a>

<br/><a href="http://www.brotherstone.co.uk/npp/ps/downloads/PythonScript_TclTk_1.0.1.0.7z">Tcl/Tk libraries 7z(1.7MB)</a>
<br/><a href="http://www.brotherstone.co.uk/npp/ps/downloads/PythonScript_TclTk_1.0.1.0.zip">Tcl/Tk libraries zip(4.6MB)</a>

<!--#include virtual="footer.inc" -->
<!--#include virtual="header.inc" -->
<h3>Local Download</h3>
Here are the local server links if you can't get to <a href="http://sourceforge.net/projects/npppythonscript/files">the main one at sourceforge</a>.
Please use the sourceforge link if you can - I have limited bandwidth limits.
<br/><br/><br/>
<br/><a href="http://www.brotherstone.co.uk/npp/ps/downloads/1.0.2.0/PythonScript_1.0.2.0.msi">Python Script 1.0.2.0 Installer (includes all extra files) (10.6MB)</a>
<br/><a href="http://www.brotherstone.co.uk/npp/ps/downloads/1.0.2.0/PythonScript_Full_1.0.2.0.7z">Python Script 1.0.2.0 FULL 7zip version (3.2MB)</a>
<br/><a href="http://www.brotherstone.co.uk/npp/ps/downloads/1.0.2.0/PythonScript_Full_1.0.2.0.zip">Python Script 1.0.2.0 FULL zip version (4.9MB)</a>
<br/><a href="http://www.brotherstone.co.uk/npp/ps/downloads/1.0.2.0/PythonScript_Min_1.0.2.0.7z">Python Script 1.0.2.0 MINIMUM 7zip version (2.3MB)</a>
<br/><a href="http://www.brotherstone.co.uk/npp/ps/downloads/1.0.2.0/PythonScript_Min_1.0.2.0.zip">Python Script 1.0.2.0 MINIMUM zip version (3.2MB)</a>
<br/><a href="http://www.brotherstone.co.uk/npp/ps/downloads/1.0.2.0/PythonScript_ExtraLibs_1.0.2.0.7z">Extra libraries 7z (906.2KB)</a>
<br/><a href="http://www.brotherstone.co.uk/npp/ps/downloads/1.0.2.0/PythonScript_ExtraLibs_1.0.2.0.zip">Extra libraries zip (1.2MB)</a>
<br/><a href="http://www.brotherstone.co.uk/npp/ps/downloads/1.0.2.0/PythonScript_TclTk_1.0.2.0.7z">Tcl/Tk libraries 7z (1.7MB)</a>
<br/><a href="http://www.brotherstone.co.uk/npp/ps/downloads/1.0.2.0/PythonScript_TclTk_1.0.2.0.zip">Tcl/Tk libraries zip (4.6MB)</a>
<!--#include virtual="footer.inc" -->

0 comments on commit 650ef89

Please sign in to comment.