Windows compile

shiyezheng · Jul 10, 2017 · 7af8ede · 7af8ede
1 parent 1676c78
commit 7af8ede
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/mars/libraries/build_for_win32.py b/mars/libraries/build_for_win32.py
@@ -33,13 +33,13 @@ def build_win32_impl(save_path, cfg_folder, cfg):
         print("Build Failed")
         return
 
-    lib_save_path = save_path + "/win/" + cfg_folder +"/mars"
+    lib_save_path = save_path + "/" + cfg_folder
     if not os.path.exists(lib_save_path):
         os.makedirs(lib_save_path)
 
     shutil.copy(PROJECT_PATH + cfg_folder + "/lib/" + LIB_NAME, lib_save_path)
 
-    copy_files(RELATIVE_PATH, lib_save_path, save_path + "/win/" + cfg_folder, WIN_COPY_EXT_FILES)
+    copy_files(RELATIVE_PATH, save_path + "/include", save_path, WIN_COPY_EXT_FILES)
 
 def build_win32(save_path):
     vs_tool_dir = os.getenv("VS140COMNTOOLS")
@@ -53,7 +53,10 @@ def build_win32(save_path):
         return
 
     while True:
-        menu_select = raw_input("input build config.\n1. Release.\n2. Debug.\n3. all.\n").strip()
+        if 3 <= len(sys.argv):
+            menu_select = sys.argv[2]
+        else:
+            menu_select = raw_input("input build config.\n1. Release.\n2. Debug.\n3. all.\n").strip()
 
         if "3" == menu_select:
             for (folder, cfg) in BUILD_CONFIGURE.items():

diff --git a/mars/libraries/mars_utils.py b/mars/libraries/mars_utils.py
@@ -28,9 +28,9 @@
         "log/crypt/log_crypt.h": "log_crypt.h",
         "stn/proto/shortlink_packer.h": "shortlink_packer.h",
         "stn/proto/shortlink_packer.cc": "shortlink_packer.cc.rewriteme",
-        "comm/windows/projdef.h": "mars/comm/windows/projdef.h",
-        "comm/windows/sys/cdefs.h": "mars/comm/windows/sys/cdefs.h",
-        "comm/windows/sys/time.h": "mars/comm/windows/sys/time.h"
+        "comm/windows/projdef.h": "include/comm/windows/projdef.h",
+        "comm/windows/sys/cdefs.h": "include/comm/windows/sys/cdefs.h",
+        "comm/windows/sys/time.h": "include/comm/windows/sys/time.h"
         }
 
 html_css = '''

diff --git a/samples/Windows/PublicComponentV2/app_callback.cpp b/samples/Windows/PublicComponentV2/app_callback.cpp
@@ -11,7 +11,7 @@
 // limitations under the License.
 
 /*
-*  app_callback.cc
+*  app_callback.cpp
 *
 *  Created on: 2017-7-7
 *      Author: chenzihao

diff --git a/samples/Windows/PublicComponentV2/stn_callback.cpp b/samples/Windows/PublicComponentV2/stn_callback.cpp
@@ -11,7 +11,7 @@
 // limitations under the License.
 
 /*
-*  stn_callback.cc
+*  stn_callback.cpp
 *
 *  Created on: 2017-7-7
 *      Author: chenzihao