update the setup.py and build utils

nanotube [2006-08-04 19:39]
update the setup.py and build utils
-use setup.py and MANIFEST to make sdist
-add data files to setup.py for py2exe
Filename
MANIFEST
MANIFEST.in
logparser.py
make_all_dist.py
setup.py
version.py
diff --git a/MANIFEST b/MANIFEST
index c083b19..d88c655 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,17 +1,18 @@
-README.txt
-setup.py
 CHANGELOG.TXT
+LICENSE.txt
+MANIFEST
+MANIFEST.in
+README.txt
+TODO.txt
 controlpanel.py
 keylogger.pyw
-LICENSE.txt
 logwriter.py
 make_all_dist.py
 mytimer.py
 mytkSimpleDialog.py
 pykeylogger.ini
 pykeylogger.val
+setup.py
 supportscreen.py
-TODO.txt
 tooltip.py
 version.py
-MANIFEST
\ No newline at end of file
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..2863477
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,9 @@
+include *.txt
+include *.TXT
+include *.py
+include *.pyw
+include pykeylogger.ini
+include pykeylogger.val
+exclude test*.py
+include MANIFEST
+include MANIFEST.in
\ No newline at end of file
diff --git a/logparser.py b/logparser.py
deleted file mode 100644
index 5b1b44e..0000000
--- a/logparser.py
+++ /dev/null
@@ -1,37 +0,0 @@
-from optparse import OptionParser
-
-class LogParser:
-    def __init__(self):
-        self.ParseOptions()
-
-        self.log = open(self.options.filename, 'rU')
-
-        #print repr(self.log.newlines)
-        self.ParseLog()
-
-    def ParseLog(self):
-
-        #while (self.line != ''):
-        #    self.line = self.log.readline()
-        self.line = self.log.readlines()
-        print self.line[0:2]
-        print repr(self.log.newlines)
-
-    def ParseOptions(self):
-        parser = OptionParser(version="%prog version 0.3")
-        parser.add_option("-f", "--file", action="store", dest="filename", help="read log data from FILENAME [default: %default]")
-        parser.add_option("-b", "--parsebackspace", action="store_true", dest="parseBackspace", help="translate backspaces into deleted characters")
-        parser.add_option("-e", "--parsedelete", action="store_true", dest="parseDelete", help="translate delete characters and arrow keys into deleted characters")
-        parser.add_option("-a", "--parsearrows", action="store_true", dest="parseArrows", help="take into account arrows and home/end")
-        parser.add_option("-d", "--debug", action="store_true", dest="debug", help="debug mode (print output to console instead of the log file)")
-
-        parser.set_defaults(filename="C:\Temp\log.txt",
-                            parseBackspace=True,
-                            parseDelete=False,
-                            parseArrows=False,
-                            debug=False)
-
-        (self.options, args) = parser.parse_args()
-
-if __name__ == '__main__':
-    lp = LogParser()
\ No newline at end of file
diff --git a/make_all_dist.py b/make_all_dist.py
index bfdeb30..9d9da31 100644
--- a/make_all_dist.py
+++ b/make_all_dist.py
@@ -37,6 +37,10 @@ if __name__ == '__main__':
     #delete old build dir.
     print r'rd /S /Q build'
     os.system(r'rd /S /Q build')
+
+    #delete old dist dir
+    print r'rd /S /Q dist'
+    os.system(r'rd /S /Q dist')

     # create the exe
     print r'c:\Python24\python setup.py py2exe'
@@ -44,29 +48,29 @@ if __name__ == '__main__':

     #pause to see output
     #os.system('pause "done, press key to continue"')
-    print r'rename "dist" "pykeylogger""'
-    os.system(r'rename "dist" "pykeylogger""')
+    print r'rename "dist" "pykeylogger-' + version.version + '""'
+    os.system(r'rename "dist" "pykeylogger-' + version.version + '""')

-    print r'copy ".\*.txt" ".\pykeylogger""'
-    os.system(r'copy ".\*.txt" ".\pykeylogger""')
+    #~ print r'copy ".\*.txt" ".\pykeylogger""'
+    #~ os.system(r'copy ".\*.txt" ".\pykeylogger""')

-    print r'copy ".\pykeylogger.ini" ".\pykeylogger""'
-    os.system(r'copy ".\pykeylogger.ini" ".\pykeylogger""')
+    #~ print r'copy ".\pykeylogger.ini" ".\pykeylogger""'
+    #~ os.system(r'copy ".\pykeylogger.ini" ".\pykeylogger""')

     #command = '\"\"C:\Progra~1\WinRAR\WinRAR.exe" a -r "pykeylogger' + version.version + '_win32.zip" "pykeylogger\"\"'
     #print repr(command)
     #os.system(command)
     print "zipping executables"
-    ZipFiles(r"pykeylogger", "pykeylogger" + version.version + "_win32.zip")
+    ZipFiles(r"pykeylogger-" + version.version, "pykeylogger-" + version.version + "_win32.zip")

     #print r'""C:\Progra~1\WinRAR\WinRAR.exe" a -r "pykeylogger' + version.version + '_win32.zip" "pykeylogger""'
     #os.system(r'""C:\Progra~1\WinRAR\WinRAR.exe" a -r "pykeylogger' + version.version + '_win32.zip" "pykeylogger""')

-    print r'move "./pykeylogger' + version.version + '_win32.zip" "../pykeylogger' + version.version + '_win32.zip"'
-    os.system(r'move "./pykeylogger' + version.version + '_win32.zip" "../pykeylogger' + version.version + '_win32.zip"')
+    print r'move ".\pykeylogger-' + version.version + r'_win32.zip" "..\pykeylogger-' + version.version + '_win32.zip"'
+    os.system(r'move ".\pykeylogger-' + version.version + r'_win32.zip" "..\pykeylogger-' + version.version + '_win32.zip"')

-    print r'rd /S /Q pykeylogger'
-    os.system(r'rd /S /Q pykeylogger')
+    print r'rd /S /Q pykeylogger-' + version.version
+    os.system(r'rd /S /Q pykeylogger-' + version.version)
     print r'rd /S /Q build'
     os.system(r'rd /S /Q build')

@@ -75,17 +79,21 @@ if __name__ == '__main__':
     #print r'""C:\Progra~1\WinRAR\WinRAR.exe" a -r "pykeylogger' + version.version + '_src.zip" "keylogger.pyw" "logwriter.py" "setup.py" "mytimer.py" "version.py" "make_all_dist.py" "*.txt" "*.bat" "html""'
     #os.system(r'""C:\Progra~1\WinRAR\WinRAR.exe" a -r "pykeylogger' + version.version + '_src.zip" "keylogger.pyw" "logwriter.py" "setup.py" "mytimer.py" "version.py" "make_all_dist.py" "*.txt" "run_exe_pykeylogger_with_cmdoptions.bat" "run_pykeylogger_with_cmdoptions.bat" "html""')

-    print "zipping sources"
-    ZipFiles(["keylogger.pyw","logwriter.py","setup.py","mytimer.py","version.py","make_all_dist.py","pykeylogger.ini","LICENSE.txt","CHANGELOG.TXT","TODO.txt","README.txt"], "pykeylogger" + version.version + "_src.zip")
+    #print "zipping sources"
+    #ZipFiles(["keylogger.pyw","logwriter.py","setup.py","mytimer.py","version.py","make_all_dist.py","pykeylogger.ini","LICENSE.txt","CHANGELOG.TXT","TODO.txt","README.txt"], "pykeylogger" + version.version + "_src.zip")
+    print "creating sdist"
+    os.system(r'c:\Python24\python setup.py sdist')

-    print r'move "./pykeylogger' + version.version + '_src.zip" "../pykeylogger' + version.version + '_src.zip"'
-    os.system(r'move "./pykeylogger' + version.version + '_src.zip" "../pykeylogger' + version.version + '_src.zip"')
+    print r'move ".\dist\pykeylogger-' + version.version + r'.zip" "..\pykeylogger-' + version.version + '_src.zip"'
+    os.system(r'move ".\dist\pykeylogger-' + version.version + r'.zip" "..\pykeylogger-' + version.version + '_src.zip"')

-    #os.system('pause "now lets create the md5 sums"')
-    print r'""C:\Progra~1\UnixUtils\md5sum.exe" "../pykeylogger' + version.version + '_src.zip" > "../pykeylogger' + version.version + '_src_md5sum.txt""'
-    os.system(r'""C:\Progra~1\UnixUtils\md5sum.exe" "../pykeylogger' + version.version + '_src.zip" > "../pykeylogger' + version.version + '_src_md5sum.txt""')
-    print r'""C:\Progra~1\UnixUtils\md5sum.exe" "../pykeylogger' + version.version + '_win32.zip" > "../pykeylogger' + version.version + '_win32_md5sum.txt""'
-    os.system(r'""C:\Progra~1\UnixUtils\md5sum.exe" "../pykeylogger' + version.version + '_win32.zip" > "../pykeylogger' + version.version + '_win32_md5sum.txt""')
+    print r'rd /S /Q dist'
+    os.system(r'rd /S /Q dist')

+    #os.system('pause "now lets create the md5 sums"')
+    print r'""C:\Progra~1\UnixUtils\md5sum.exe" "..\pykeylogger-' + version.version + r'_src.zip" > "..\pykeylogger-' + version.version + '_src_md5sum.txt""'
+    os.system(r'""C:\Progra~1\UnixUtils\md5sum.exe" "..\pykeylogger-' + version.version + r'_src.zip" > "..\pykeylogger-' + version.version + '_src_md5sum.txt""')
+    print r'""C:\Progra~1\UnixUtils\md5sum.exe" "..\pykeylogger-' + version.version + r'_win32.zip" > "..\pykeylogger-' + version.version + '_win32_md5sum.txt""'
+    os.system(r'""C:\Progra~1\UnixUtils\md5sum.exe" "..\pykeylogger-' + version.version + r'_win32.zip" > "..\pykeylogger-' + version.version + '_win32_md5sum.txt""')

     os.system(r'pause "done, press to key to exit""')
diff --git a/setup.py b/setup.py
index c2500c3..c1ff535 100644
--- a/setup.py
+++ b/setup.py
@@ -22,6 +22,7 @@ setup(
     license = version.license,
     author = version.author,
     author_email = version.author_email,
+    platforms = [version.platform],

     data_files = [("",["pykeylogger.ini",
                         "pykeylogger.val",
diff --git a/version.py b/version.py
index 9116465..b8efbdd 100644
--- a/version.py
+++ b/version.py
@@ -1,9 +1,9 @@

-name = "Python Keylogger for Windows"
+name = "pykeylogger"
 version = "0.8.0"
 description = "Simple Python Keylogger for Windows"
 url = "http://pykeylogger.sourceforge.net"
 license = "GPL"
 author = "Nanotube"
 author_email = "nanotube@users.sf.net"
-platforms = ["Windows NT/2000/XP"]
\ No newline at end of file
+platform = "Windows NT/2000/XP"
\ No newline at end of file
ViewGit