Skip to content

Commit 650ef89

Browse files
brudersteinbruderstein
committed
Version 1.0.2.0
Fixed hard coded path in docs build process
1 parent e0a8fc7 commit 650ef89

File tree

6 files changed

+27
-27
lines changed

6 files changed

+27
-27
lines changed

‎PythonScript/src/PythonScriptVersion.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef _PYTHONSCRIPTVERSION_H
22
#define _PYTHONSCRIPTVERSION_H
33

4-
#define PYSCR_VERSION_NUMERIC 1,0,1,0
5-
#define PYSCR_VERSION_STRING "1.0.1.0"
4+
#define PYSCR_VERSION_NUMERIC 1,0,2,0
5+
#define PYSCR_VERSION_STRING "1.0.2.0"
66

77
#endif

‎docs/source/conf.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
# serve to show the default.
1313

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

4241
# General information about the project.
4342
project = u'PythonScript'
44-
copyright = u'2010, Dave Brotherstone'
43+
copyright = u'2010,2014 Dave Brotherstone'
4544

4645
# The version info for the project you're documenting, acts as replacement for
4746
# |version| and |release|, also used in various other places throughout the
4847
# built documents.
4948
#
5049
# The short X.Y version.
51-
pyscr_base = r"E:\work\PythonScript"
52-
version_file = open(pyscr_base + r"\PythonScript\src\PythonScriptVersion.h")
50+
pyscr_version_file = os.path.join(os.path.abspath(os.path.dirname(__file__)), r'..\..\PythonScript\src\PythonScriptVersion.h')
51+
version_file = open(pyscr_version_file)
5352
version_contents = version_file.read()
5453
version_file.close()
5554
match = re.search(r'#define PYSCR_VERSION_STRING "([0-9.]+)"', version_contents)

‎www/changelog.shtml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
<!--#include virtual="header.inc" -->
22
<h3>Change log:</h3>
33
<br/>
4+
<b>1.0.2.0</b>
5+
<ul>
6+
<li>Fixed bug with Editor.rereplace that stopped conditional replacements working (thanks to Cyrillev for reporting)</li>
7+
</ul>
8+
<br/>
49
<b>1.0.1.0</b>
510
<ul>
611
<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>

‎www/download.shtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ There's no difference between the zip and the 7zip versions, just that the 7zip
1515
<br/><br/>
1616
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>
1717
h
18-
<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>
18+
<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>
1919

2020
<br/>
2121
<br/>

‎www/header.inc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<br/>
3131
<br/>
3232
<br/>
33-
Latest Version: 1.0.1.0
33+
Latest Version: 1.0.2.0
3434
<br/>
3535
<br/>
3636
<br/>

‎www/localdl.shtml‎

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
1-
<!--#include virtual="header.inc" -->
2-
3-
<h3>Local Download</h3>
4-
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>.
5-
Please use the sourceforge link if you can - I have limited bandwidth limits.
6-
<br/><br/><br/>
7-
<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>
8-
<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>
9-
<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>
10-
<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>
11-
<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>
12-
13-
<br/><a href="http://www.brotherstone.co.uk/npp/ps/downloads/PythonScript_ExtraLibs_1.0.1.0.7z">Extra libraries 7z(900KB)</a>
14-
<br/><a href="http://www.brotherstone.co.uk/npp/ps/downloads/PythonScript_ExtraLibs_1.0.1.0.zip">Extra libraries zip(1.2MB)</a>
15-
16-
<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>
17-
<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>
18-
19-
<!--#include virtual="footer.inc" -->
1+
<!--#include virtual="header.inc" -->
2+
<h3>Local Download</h3>
3+
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>.
4+
Please use the sourceforge link if you can - I have limited bandwidth limits.
5+
<br/><br/><br/>
6+
<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>
7+
<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>
8+
<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>
9+
<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>
10+
<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>
11+
<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>
12+
<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>
13+
<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>
14+
<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>
15+
<!--#include virtual="footer.inc" -->

0 commit comments

Comments
 (0)