-

Ram Rachum · Ram Rachum · commit bb6987015438 · 2011-02-14T18:51:58.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -15,7 +15,7 @@ garlicsim_wx/*dist
 garlicsim_wx/*.egg-info
 garlicsim_wx/build
 
-py2exe_dist
+win_dist
 
 */docs/_build/*
 */docs/_deployed_build/*
diff --git a/garlicsim_wx/installer_script.iss b/garlicsim_wx/installer_script.iss
@@ -17,7 +17,7 @@ ChangesEnvironment=yes
 DefaultDirName={pf}\GarlicSim
 DefaultGroupName=GarlicSim
 AllowNoIcons=yes
-LicenseFile=../py2exe_dist/lib/garlicsim_wx/copyright.txt
+LicenseFile=../win_dist/lib/garlicsim_wx/copyright.txt
 OutputDir=..
 OutputBaseFilename=GarlicSim-0.6.1
 Compression=lzma
@@ -40,8 +40,8 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
 
 
 [Files]
-Source: "../py2exe_dist/GarlicSim.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "../py2exe_dist/*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "../win_dist/GarlicSim.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "../win_dist/*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]
diff --git a/garlicsim_wx/py2exe_cruft/setup_extension.py b/garlicsim_wx/py2exe_cruft/setup_extension.py
@@ -213,7 +213,7 @@ def get_garlicsim_script_files():
 
 def get_dlls_and_stuff():
     '''
-    Get some miscellaneous files that need to be copied to `py2exe_dist`.
+    Get some miscellaneous files that need to be copied to `win_dist`.
     
     This returns a list of tuples, where the second item in each tuple is a
     list of files and the first item is the path to which these files should be
@@ -240,7 +240,7 @@ def get_dlls_and_stuff():
 
 def get_all_data_files():
     '''
-    Get all the data files that need to be copied to py2exe_dist.
+    Get all the data files that need to be copied to win_dist.
     
     This includes the data files for the `garlicsim`, `garlicsim_lib` and
     `garlicsim_wx` packages, and some miscellaneous data files.
@@ -345,9 +345,9 @@ def get_all_submodules(package_name):
         
         'py2exe': {
             
-            # Putting distribution files in `py2exe_dist` at the root of the\
+            # Putting distribution files in `win_dist` at the root of the\
             # repo:            
-            'dist_dir': '../py2exe_dist',
+            'dist_dir': '../win_dist',
             
             # We prefer to have all the files in a folder instead of a zip
             # file.            
diff --git a/make_distribution.py b/make_distribution.py
@@ -4,13 +4,22 @@
 # or distributed without explicit written permission from Ram Rachum.
 
 '''
-Script for packaging GarlicSim for Windows users.
+Script for packaging GarlicSim as a complete program to end users.
 
-Run without arguments to package GarlicSim using `py2exe` into the
-`py2exe_dist`.
+Currently implemented only for Windows.
 
-Options:
+Different op:
 
+    --win [OR] -w
+        Create a Windows distribution.
+
+    --mac [OR] -m
+        Create a Mac distribution.
+
+    --deb [OR] -d
+        Create a Debian Linux distribution.
+
+        
     --installer [OR] -i
         After running py2exe, produce an installer using Inno Setup
         
@@ -87,7 +96,7 @@ def assert_no_unknown_folders():
 folders_to_delete = []
 for folder in [os.path.join(garlicsim_wx_path, 'build'),
                os.path.join(garlicsim_wx_path, 'garlicsim_wx.egg-info'),
-               os.path.join(repo_root_path, 'py2exe_dist')]:
+               os.path.join(repo_root_path, 'win_dist')]:
     if os.path.exists(folder):
         folders_to_delete.append(folder)
 
@@ -135,7 +144,7 @@ def assert_no_unknown_folders():
     os.chdir(old_cwd)
 
 sys.stdout.write('Py2exe packaging complete. Distribution files are in the '
-                 '`py2exe_dist` folder.\n')
+                 '`win_dist` folder.\n')
 #                                                                             #
 ### Finished packaging with py2exe. ###########################################
     
diff --git a/run_tests.py b/run_tests.py
@@ -305,7 +305,7 @@ def loadTestsFromDir(self, path):
     
     testing_from_zip = '--from-zip' in argv
     testing_from_py2exe = ('--from-py2exe' in argv) or \
-        ((frozen is not None) and ('py2exe_dist' in our_path))
+        ((frozen is not None) and ('win_dist' in our_path))
     testing_from_win_installer = ('--from-installer' in argv) or \
         ((frozen is not None) and ('run_tests.exe' in sys.executable))
     
@@ -324,7 +324,7 @@ def loadTestsFromDir(self, path):
             sys.exit(temp_result)
             
         sys.exit(os.system('"%s" %s' % (os.path.join(our_path,
-                           'py2exe_dist', 'run_tests.exe'), ' '.join(argv))))
+                           'win_dist', 'run_tests.exe'), ' '.join(argv))))
     
     if testing_from_win_installer and not frozen:
         argv.remove('--from-win-installer')
@@ -336,7 +336,7 @@ def loadTestsFromDir(self, path):
             sys.exit(temp_result)
             
         sys.exit(os.system('"%s" %s' % (os.path.join(our_path,
-                           'py2exe_dist', 'run_tests.exe'), ' '.join(argv))))
+                           'win_dist', 'run_tests.exe'), ' '.join(argv))))
         pass
     
     if testing_from_zip:
