W64 package dirname for windows, bug fix

diff --git a/commands/package.py b/commands/package.py
index 02a8e7d566cabd82de6d3927a481ddafd5adf1b2..03d10559c40a2503a3a4a053d73e5837837ff9b0 100644 (file)
--- a/commands/package.py
+++ b/commands/package.py
@@ -255,7 +255,7 @@ def produce_relative_launcher(config,
     
     # Little hack to put out_dir_Path outside the strings
     src.replace_in_file(filepath, 'r"out_dir_Path', 'out_dir_Path + r"' )
-    src.replace_in_file(filepath, "'out_dir_Path + ", "out_dir_Path + '" )
+    src.replace_in_file(filepath, "r'out_dir_Path + ", "out_dir_Path + r'" )
     
     # A hack to put a call to a file for distene licence.
     # It does nothing to an application that has no distene product
@@ -926,7 +926,7 @@ def make_archive(prod_name, prod_info, where):
     :return: The path of the resulting archive
     :rtype: str
     '''
-    path_targz = os.path.join(dir_name, archive_name + PACKAGE_EXT)
+    path_targz_prod = os.path.join(where, prod_name + PACKAGE_EXT)
     tar_prod = tarfile.open(path_targz_prod, mode='w:gz')
     local_path = prod_info.source_dir
     tar_prod.add(local_path,

diff --git a/src/architecture.py b/src/architecture.py
index 0662509bc803fcdceebf108951b46c0cf34351c2..662578ec0fe062db00331cda8c3f81fd78cb0d20 100644 (file)
--- a/src/architecture.py
+++ b/src/architecture.py
@@ -44,9 +44,6 @@ def get_user():
         import pwd
         return pwd.getpwuid(os.getuid())[0]
 
-def get_windows_os_label():
-    '''returns the SAT convention used for Windows labeling '''
-    return "W" # in order to fulfill the 8196 length constraint!
        
 def get_distribution(codes):
     '''Gets the code for the distribution
@@ -57,7 +54,7 @@ def get_distribution(codes):
     :rtype: str
     '''
     if is_windows():
-        return get_windows_os_label()
+        return "W"
 
     # else get linux distribution description from platform, and encode it with code
     lin_distrib = platform.dist()[0].lower()
@@ -100,7 +97,7 @@ def get_distrib_version(distrib):
     '''
 
     if is_windows():
-        return platform.release()
+        return "64"
 
     # get version from platform
     dist_version=platform.dist()[1].split('.')

diff --git a/src/internal_config/salomeTools_win.pyconf b/src/internal_config/salomeTools_win.pyconf
index 340a56962849ad64aa3061ebdce030626fab136b..7d9165fe5a74629647723074980795a802314209 100644 (file)
--- a/src/internal_config/salomeTools_win.pyconf
+++ b/src/internal_config/salomeTools_win.pyconf
@@ -8,7 +8,7 @@ INTERNAL :
     {    
         copy_prefix : "LOCAL_"
         install_dir : "W64"
-        binary_dir : "BIN-"
+        binary_dir : ""
         single_install_dir : "EXT"
     }
     log :