diff --git a/make_all_dist.py b/make_all_dist.py
index 7605342..6ebd8f3 100644
--- a/make_all_dist.py
+++ b/make_all_dist.py
@@ -2,53 +2,87 @@ import version
import os
import sys
-if raw_input("Current version is " + version.version + ". Is that correct? [Y/N] ") in ["y", "Y", "yes", "YES", "Yes"]:
- pass
-else:
- sys.exit()
+import zipfile
+import zlib
-#delete old build dir.
-print r'rd /S /Q build'
-os.system(r'rd /S /Q build')
-# create the exe
-print r'c:\Python24\python setup.py py2exe'
-os.system(r'c:\Python24\python setup.py py2exe')
+def ZipFiles(targetdir, ziparchivename):
+ '''Create a zip archive of all files in the target directory.
+ '''
+ #os.chdir(targetdir)
+ myzip = zipfile.ZipFile(ziparchivename, "w", zipfile.ZIP_DEFLATED)
+
+ if type(targetdir) == str:
+ for root, dirs, files in os.walk(targetdir):
+ for fname in files:
+ if fname != ziparchivename:
+ myzip.write(os.path.join(root,fname))
+ if type(targetdir) == list:
+ for fname in targetdir:
+ myzip.write(fname)
+
+ myzip.close()
+ myzip = zipfile.ZipFile(ziparchivename, "r", zipfile.ZIP_DEFLATED)
+ if myzip.testzip() != None:
+ print "Warning: Zipfile did not pass check."
+ myzip.close()
-#pause to see output
-#os.system('pause "done, press key to continue"')
-print r'rename "dist" "pykeylogger""'
-os.system(r'rename "dist" "pykeylogger""')
+if __name__ == '__main__':
-print r'copy ".\*.txt" ".\pykeylogger""'
-os.system(r'copy ".\*.txt" ".\pykeylogger""')
+ if raw_input("Current version is " + version.version + ". Is that correct? [Y/N] ") in ["y", "Y", "yes", "YES", "Yes"]:
+ pass
+ else:
+ sys.exit()
-print r'copy ".\run_exe_pykeylogger_with_cmdoptions.bat" ".\pykeylogger""'
-os.system(r'copy ".\run_exe_pykeylogger_with_cmdoptions.bat" ".\pykeylogger""')
+ #delete old build dir.
+ print r'rd /S /Q build'
+ os.system(r'rd /S /Q build')
-#command = '\"\"C:\Progra~1\WinRAR\WinRAR.exe" a -r "pykeylogger' + version.version + '_win32.zip" "pykeylogger\"\"'
-#print repr(command)
-#os.system(command)
-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""')
+ # create the exe
+ print r'c:\Python24\python setup.py py2exe'
+ os.system(r'c:\Python24\python setup.py py2exe')
-print r'mv "./pykeylogger' + version.version + '_win32.zip" "../pykeylogger' + version.version + '_win32.zip"'
-os.system(r'mv "./pykeylogger' + version.version + '_win32.zip" "../pykeylogger' + version.version + '_win32.zip"')
+ #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'rd /S /Q pykeylogger'
-os.system(r'rd /S /Q pykeylogger')
-print r'rd /S /Q build'
-os.system(r'rd /S /Q build')
+ print r'copy ".\*.txt" ".\pykeylogger""'
+ os.system(r'copy ".\*.txt" ".\pykeylogger""')
-#os.system('pause "done, now lets create the src dist"')
-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 r'copy ".\pykeylogger.ini" ".\pykeylogger""'
+ os.system(r'copy ".\pykeylogger.ini" ".\pykeylogger""')
-print r'mv "./pykeylogger' + version.version + '_src.zip" "../pykeylogger' + version.version + '_src.zip"'
-os.system(r'mv "./pykeylogger' + version.version + '_src.zip" "../pykeylogger' + version.version + '_src.zip"')
+ #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")
+
+ #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""')
-#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 + '_win32.zip" > "../pykeylogger' + version.version + '_md5sums.txt""'
-os.system(r'""C:\Progra~1\UnixUtils\md5sum.exe" "../pykeylogger' + version.version + '_src.zip" "../pykeylogger' + version.version + '_win32.zip" > "../pykeylogger' + version.version + '_md5sums.txt""')
+ 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"')
-os.system(r'pause "done, press to key to exit""')
+ print r'rd /S /Q pykeylogger'
+ os.system(r'rd /S /Q pykeylogger')
+ print r'rd /S /Q build'
+ os.system(r'rd /S /Q build')
+
+ os.system(r'pause "done, now lets create the src dist"')
+ #sys.exit()
+ #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 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"')
+
+ #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 + '_win32.zip" > "../pykeylogger' + version.version + '_md5sums.txt""'
+ os.system(r'""C:\Progra~1\UnixUtils\md5sum.exe" "../pykeylogger' + version.version + '_src.zip" "../pykeylogger' + version.version + '_win32.zip" > "../pykeylogger' + version.version + '_md5sums.txt""')
+
+ os.system(r'pause "done, press to key to exit""')