Merge branch 'master' of https://github.com/pepr/doxygen into pepr

Conflicts:
	src/libdoxygen.pro.in
	winbuild/Doxygen.vcproj

2 files changed, 21 insertions, 98 deletions

diff --git a/winbuild/Doxygen.vcproj b/winbuild/Doxygen.vcproj
index 45ba3e1..1822438 100644
--- a/winbuild/Doxygen.vcproj
+++ b/winbuild/Doxygen.vcproj
@@ -3167,11 +3167,11 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\store.cpp"
+				RelativePath="..\src\sqlite3gen.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\src\sqlite3gen.cpp"
+				RelativePath="..\src\store.cpp"
 				>
 			</File>
 			<File
@@ -3261,47 +3261,7 @@
 			<File
 				RelativePath="..\src\tooltip.cpp"
 				>
-			</File>
-			<File
-				RelativePath="..\src\translator.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
+			</File>			
 			<File
 				RelativePath="..\src\util.cpp"
 				>
@@ -4190,10 +4150,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\translatordecoder.h"
-				>
-			</File>
-			<File
 				RelativePath="..\src\unistd.h"
 				>
 				<FileConfiguration
diff --git a/winbuild/pack_the_distribution_for_windows.py b/winbuild/pack_the_distribution_for_windows.py
index 0c63394..a1b6c19 100644
--- a/winbuild/pack_the_distribution_for_windows.py
+++ b/winbuild/pack_the_distribution_for_windows.py
@@ -1,4 +1,4 @@
-#! python2

+#! python2

 

 from __future__ import print_function

 

@@ -10,37 +10,6 @@ import sys
 import textwrap

 

 

-def getCurrentSubdirName():

-    subdir, fname = os.path.split(os.path.realpath(__file__))

-    return os.path.basename(subdir)

-

-

-def getCurrentBranchName():

-    result = None

-    cmd = 'git branch --list --no-color'

-    pipe = subprocess.Popen(cmd, stdout=subprocess.PIPE).stdout

-    for line in pipe:

-        line = line.decode('utf-8')

-        if line.startswith('*'):

-            result = line[2:].rstrip()

-    pipe.close()

-    return result

-

-

-def getUserName():

-    user = None             # init

-    p = subprocess.Popen('git config user.name', stdout=subprocess.PIPE)

-    user = p.communicate()[0]

-    user = user.decode('utf-8')

-    p.wait()

-    return user

-

-

-def getUserInitials():

-    user = getUserName()

-    return ''.join(s[0] for s in user.split())

-

-

 def gitSHA_date_time():

     cmd = 'git rev-parse --short HEAD'

     p = subprocess.Popen(cmd, stdout=subprocess.PIPE)

@@ -62,16 +31,6 @@ def gitSHA_date_time():
     return sha, dstamp, tstamp

 

 

-def gitDescribe():

-    result = None

-    cmd = 'git describe'

-    p = subprocess.Popen(cmd, stdout=subprocess.PIPE)

-    descr = p.communicate()[0]

-    descr = descr.decode('utf-8')

-    p.wait()

-    return descr.strip()

-

-

 def getDoxygenVersion():

     # ... from the VERSION file.

     sdir, fname = getThisScriptPathAndName()

@@ -206,10 +165,15 @@ def buildAndZipTranslatorReport(distr_dir):
     os.chdir(wd)  # back to the original working directory

 

 

-def xxx():

+def mailto():

 

-    # Vytvoříme dopis.

-    subject = 'Windows binaries available for %s in SVN' % doxdir

+    # Information for the letter.

+    ver = getDoxygenVersion()

+    sha, dstamp, tstamp = gitSHA_date_time()

+    doxzipname = getBinariesZipBareName()

+    trzipname = getTranslatorReportZipBareName()

+

+    subject = 'Windows binaries available for {}-{} at SourceForge'.format(ver, dstamp)

     subject = subject.replace(' ', '%20')

 

     body = textwrap.dedent('''\

@@ -223,7 +187,7 @@ def xxx():
         This is the place where you should find also the next

         releases.  Name of the archive file is

 

-          %s

+          {}

 

         The related translator report can be found inside the directory

 

@@ -231,20 +195,20 @@ def xxx():
 

         Name of the archive file is

 

-          %s

+          {}

 

         The binaries are NOT created automatically, so it may

-        happen that some newer SVN sources were not compiled

+        happen that some newer sources were not compiled

         because I am not present to do that or I forgot... ;)

 

         Regards,

             Petr

 

         --

-        Petr Prikryl (prikryl at atlas dot cz)''') % (doxzipname, trzipname)

+        Petr Prikryl (prikryl at atlas dot cz)''').format(doxzipname, trzipname)

     body = body.replace('\n', '%0d')

 

-    # Zkonstruujeme URI a spustíme mailer pro odeslání dopisu.

+    # Make the mailto URI and launch the mailer.

     to_addr = 'doxygen-users@lists.sourceforge.net'

     mailtoURI = 'mailto:%s?subject=%s&body=%s' % (to_addr, subject, body)

     os.startfile(mailtoURI)

@@ -262,4 +226,7 @@ if __name__ == '__main__':
     zipBinaries(dist_dir)

 

     # The translator report...

-    buildAndZipTranslatorReport(dist_dir)
\ No newline at end of file
+    buildAndZipTranslatorReport(dist_dir)

+

+    # Launch the mailer with the generated message body.

+    mailto()
\ No newline at end of file