X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=nucleus%2Fapplications%2Fbundler%2Fbundle_creator.cpp;h=8212edc32e63b10d0063fc69d67542f29bd0d7b6;hb=118b53690a49dead67f39e3bf38c54643bff9dd1;hp=52affc8f6bfe87109278e3f3b12cdfc35d9768d4;hpb=393c5d16bddb0ffef914699d2294ca2204dd16d7;p=feisty_meow.git diff --git a/nucleus/applications/bundler/bundle_creator.cpp b/nucleus/applications/bundler/bundle_creator.cpp index 52affc8f..8212edc3 100644 --- a/nucleus/applications/bundler/bundle_creator.cpp +++ b/nucleus/applications/bundler/bundle_creator.cpp @@ -239,6 +239,10 @@ Abandoning bundling process.\n", _app_name.s())); environment::set("DLL_START", ""); environment::set("DLL_END", ".dll"); #endif + // specify a target variable on the source side so that we can operate in there, + // even if the bundle doesn't specify one. otherwise we can't run source side commands + // properly if the paths are based on TARGET (like TMP often is). + environment::set("TARGET", environment::TMP()); int ret = 0; if ( (ret = read_manifest()) ) FAIL_RETURN(ret, "reading manifest"); @@ -465,12 +469,12 @@ int bundle_creator::read_manifest() BASE_LOG(astring("will set ") + _manifest_list[i]._payload + " = " + _manifest_list[i]._parms); astring new_value = parser_bits::substitute_env_vars(_manifest_list[i]._parms); -///why oh why are we allowing them to overwrite our actual environment just because they're bundling something? environment::set(_manifest_list[i]._payload, new_value); + environment::set(_manifest_list[i]._payload, new_value); -#ifdef DEBUG_BUNDLER +//#ifdef DEBUG_BUNDLER BASE_LOG(astring("** variable ") + _manifest_list[i]._payload + " should have value=" + new_value); BASE_LOG(astring("** variable ") + _manifest_list[i]._payload + " now does have value=" + environment::get(_manifest_list[i]._payload)); -#endif +//#endif continue; } else if (ini.get(section_name, "assert_defined", value)) {