sat #32534 : warning if the application is used on a not supported platform, and...

[tools/sat.git] / commands / package.py

diff --git a/commands/package.py b/commands/package.py
index f5655a854d156925229d34fa689170fe18c35a30..fd5bba7efc07a377ac97c64d3f8b0a7e493d4aea 100644 (file)
--- a/commands/package.py
+++ b/commands/package.py
@@ -103,6 +103,7 @@ PROJECTS :
 {
   project_file_paths : 
   [
+$LOCAL.workdir + $VARS.sep + \"""" + PROJECT_DIR + """\" + $VARS.sep + "project.pyconf"
   ]
 }
 """)
@@ -447,6 +448,7 @@ def produce_relative_env_files(config,
     else:
       src.replace_in_file(filepath, '"out_dir_Path', '"${out_dir_Path}' )
       src.replace_in_file(filepath, ':out_dir_Path', ':${out_dir_Path}' )
+      src.replace_in_file(filepath, ';out_dir_Path', ';${out_dir_Path}' )
 
     if exe_name:
         if src.architecture.is_windows():
@@ -1316,7 +1318,9 @@ def find_product_scripts_and_pyconf(p_name,
                     product_pyconf_cfg[section].archive_info.archive_name =\
                         p_info.name + ".tgz"
     
-    if (with_vcs) and src.product.product_is_vcs(p_info):
+    # save git repositories for vcs products, even if archive is not in VCS mode
+    # in this case the user will be able to change get_source flag and work with git
+    if src.product.product_is_vcs(p_info):
         # in vcs mode we must replace explicitely the git server url
         # (or it will not be found later because project files are not exported in archives)
         for section in product_pyconf_cfg: