Changeset 19aa896 in sasview

Timestamp:

Aug 12, 2011 9:37:18 AM (13 years ago)

Author:

Gervaise Alina <gervyh@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

c4af24f

Parents:

1c7acc7

Message:

modify folder path

Location:

sansview/scripts

Files:

• installer_generator.py (modified) (4 diffs)
• local_config.py (modified) (1 diff)
• setup_exe.py (modified) (3 diffs)

sansview/scripts/installer_generator.py

@@ -10 +10 @@
 REG_PROGRAM = """{app}\MYPROG.EXE"" ""%1"""
 APPLICATION = str(local_config.__appname__ )+ '.exe'
-AppName  = str(local_config.__appname__ ) # + '-'+ str(local_config.__version__)
-AppVerName = str(local_config.__appname__ ) + '-'+ str(local_config.__version__)
+AppName = str(local_config.__appname__ )# + '-'+ str(local_config.__version__)
+AppVerName = str(local_config.__appname__ )+'-'+ str(local_config.__version__)
 Dev = ''
 if AppVerName.lower().count('dev') > 0:
@@ -33 +33 @@
 #find extension for windows file assocation
 #extension list need to be modified for each application
+
+icon_path =  local_config.icon_path
+media_path = local_config.media_path
+test_path = local_config.test_path
 
 def find_extension():
@@ -139 +143 @@
     return msg
 
+path, _ =  os.path.split(os.getcwd())
+dist_path = os.path.join(path, "scripts", "dist")
 def write_file():
     """
@@ -144 +150 @@
     """
     msg = "\n\n[Files]\n"
-    msg += """Source: "dist\%s";\t""" % str(APPLICATION)
+    msg += """Source: "%s\%s";\t""" % (dist_path, str(APPLICATION))
     msg += """DestDir: "{app}";\tFlags: ignoreversion\n"""
     msg += """Source: "dist\*";\tDestDir: "{app}";\t"""
     msg += """Flags: ignoreversion recursesubdirs createallsubdirs\n"""
-    msg += """Source: "images\*";\tDestDir: "{app}\%s";\t""" % str("images")
+    msg += """Source: "%s\*";\tDestDir: "{app}\%s";\t""" % (icon_path, str("images"))
     msg += """Flags: ignoreversion recursesubdirs createallsubdirs\n"""
-    msg += """Source: "test\*";\tDestDir: "{app}\%s";\t""" % str("test")
+    msg += """Source: "%s\*";\tDestDir: "{app}\%s";\t""" % (test_path, str("test"))
     msg += """Flags: ignoreversion recursesubdirs createallsubdirs\n"""
     msg += """;\tNOTE: Don't use "Flags: ignoreversion" on any shared system files"""

sansview/scripts/local_config.py

@@ -50 +50 @@
 icon_path = os.path.join(path, "images")
 media_path = os.path.join(path, "media")
+test_path = os.path.join(path, "test")
 #edit the list of file state your plugin can read
 APPLICATION_WLIST = 'SansView files (*.svs)|*.svs'

sansview/scripts/setup_exe.py

@@ -75 +75 @@
 # to use the MatPlotLib.
 #
+current_dir = os.getcwd()
+path, _ = os.path.split(current_dir)
+plugins_dir = os.path.join(path, "plugins")
+media_dir = os.path.join(path, "media")
+images_dir = os.path.join(path, "images")
+test_dir = os.path.join(path, "test")
+
 matplotlibdatadir = matplotlib.get_data_path()
 matplotlibdata = findall(matplotlibdatadir)
 data_files = []
+from glob import glob
+data_files = [("Microsoft.VC90.CRT", glob(r'C:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\*.*'))]
+sys.path.append("C:\\Program Files\\Microsoft Visual Studio 9.0\\VC\\redist\\x86\\Microsoft.VC90.CRT")
 # Copying SLD data
 import periodictable
@@ -107 +117 @@
     data_files.append(('.', [f]))
 # Copying the images directory to the distribution directory.
-for f in findall('images'):
+for f in findall(images_dir):
     if os.path.split(f)[0].count('.svn')==0:
         data_files.append((os.path.split(f)[0], [f]))
 
 # Copying the HTML help docs
-for f in findall('media'):
+for f in findall(media_dir):
     if os.path.split(f)[0].count('.svn')==0:
         data_files.append((os.path.split(f)[0], [f]))
 
 # Copying the sample data user data
-for f in findall('test'):
+for f in findall(test_dir):
     if os.path.split(f)[0].count('.svn')==0:
         data_files.append((os.path.split(f)[0], [f]))
         
 # Copying the sample data user data
-for f in findall('plugins'):
+for f in findall(plugins_dir):
     if os.path.split(f)[0].count('.svn')==0:
         data_files.append((os.path.split(f)[0], [f]))
@@ -144 +154 @@
     description = 'SansView',
     script = 'sansview.py',
-    icon_resources = [(1, "images/ball.ico")],
+    icon_resources = [(1, os.path.join(images_dir, "ball.ico"))],
     other_resources = [(24,1,manifest)],
     dest_base = "SansView"