updates to fix bundler on win32

[feisty_meow.git] / nucleus / applications / bundler / bundle_creator.cpp

diff --git a/nucleus/applications/bundler/bundle_creator.cpp b/nucleus/applications/bundler/bundle_creator.cpp
index 7bb049478ffdeb0d6f508facc768ed888a321e24..9313883f0fd0c4c0998f4e3f5241b49beb70f45d 100644 (file)
--- a/nucleus/applications/bundler/bundle_creator.cpp
+++ b/nucleus/applications/bundler/bundle_creator.cpp
@@ -45,9 +45,9 @@
 #include <stdio.h>
 #include <sys/stat.h>
 #include <zlib.h>
-#ifdef __WIN32__
-  #include <io.h>
-#endif
+//#ifdef __WIN32__
+  //#include <io.h>
+//#endif
 
 using namespace application;
 using namespace basis;
@@ -103,7 +103,7 @@ public:
   bundle_creator()
       : application_shell(),
         _app_name(filename(_global_argv[0]).basename()),
-        _bundle(NIL), _stub_size(0), _keyword() {}
+        _bundle(NULL_POINTER), _stub_size(0), _keyword() {}
 
   virtual ~bundle_creator() {
     WHACK(_bundle);
@@ -192,6 +192,9 @@ int bundle_creator::execute()
   BASE_LOG(astring("starting file bundling at ") + time_stamp::notarize(false));
 
   command_line cmds(_global_argc, _global_argv);
+
+//BASE_LOG(astring("before starting, cmds has: ") + parser_bits::platform_eol_to_chars() + cmds.text_form());
+
   astring temp;
   if (cmds.get_value('?', temp)) return print_instructions();
   if (cmds.get_value("?", temp)) return print_instructions();
@@ -748,7 +751,7 @@ astring bundle_creator::determine_stub_file_and_validate()
 #ifdef __WIN32__
   astring stub_filename("unpacker_stub.exe");
 #endif
-  astring repo_dir = "$PRODUCTION_DIR";
+  astring repo_dir = "$RUNTIME_PATH";
   astring stub_file = parser_bits::substitute_env_vars
       (repo_dir + "/binaries/" + stub_filename, false);
   if (!filename(stub_file).exists()) {