updates from orpheus for windoze build

[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 a7855255ced85bf3e3ddd0ea8796cf972ce3f924..b8e2fceb5fadb470c98c552e4f7f972553d44649 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);
@@ -328,7 +328,7 @@ int bundle_creator::add_files_here(directory &dirndl, const astring &source,
 int bundle_creator::recurse_into_dir(const astring &source,
     const astring &target, int manifest_index)
 {
-//  FUNCDEF("recurse_into_dir");
+  FUNCDEF("recurse_into_dir");
 //LOG(astring("src=") + source + " dest=" + target);
 
   // we won't include the subversion folder.
@@ -366,7 +366,7 @@ int bundle_creator::recurse_into_dir(const astring &source,
 int bundle_creator::patch_recursive_target(const astring &source,
     const astring &target, int manifest_index)
 {
-//  FUNCDEF("patch_recursive_target");
+  FUNCDEF("patch_recursive_target");
 //LOG(astring("patch recurs src=") + source + " targ=" + target);
   return recurse_into_dir(source, target, manifest_index);
 }
@@ -374,7 +374,7 @@ int bundle_creator::patch_recursive_target(const astring &source,
 int bundle_creator::patch_wildcard_target(const astring &source,
     const astring &target, int manifest_index)
 {
-//  FUNCDEF("patch_wildcard_target");
+  FUNCDEF("patch_wildcard_target");
   // find the last slash.  the rest is our wildcard component.
   int src_end = source.end();
   int slash_indy = source.find('/', src_end, true);
@@ -748,7 +748,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()) {
@@ -922,7 +922,7 @@ int bundle_creator::finalize_file()
 
 int bundle_creator::write_offset()
 {
-//  FUNCDEF("write_offset");
+  FUNCDEF("write_offset");
   byte_filer bun(_output_file, "r+b");  // open the file for updating.
 
   astring magic_string("muftiloc");  // our sentinel string.