GitHub PullRequestReviewCommentEvent at 2014-03-25 06:26:51
Repository: FreeCAD_sf_master
Actor: peterl94
Payload: {"comment":{"url":"https://api.github.com/repos/peterl94/FreeCAD_sf_master/pulls/comments/10918830","id":10918830,"diff_hunk":"@@ -7,50 +7,49 @@\n source = {\"type\":\"archive\", \"url\":\"http://sourceforge.net/code-snapshots/svn\"\\\n           \"/n/ne/netgen-mesher/code/netgen-mesher-code-751-branches-netgen-4.9.zip\"}\n depends_on = [\"oce\"]\n+patches = []\n     \n def build(libpack):\n     \n     if libpack.toolchain.startswith(\"vc\"):\n-        if libpack.toolchain == \"vc9\":\n-            #for now, use netgen's pre-compiled dependencies\n-            if not os.path.exists(\"..\\\\ext_libs\"):\n-                os.mkdir(\"..\\\\ext_libs\")\n-            bit = \"32\"\n-            if libpack.arch == \"x64\": bit = \"64\"\n-            \n-            pthread_url = \"http://sourceforge.net/projects/netgen-mesher/files\"\\\n-                          \"/netgen-mesher/Additional%20Files/MSVC2008_Libs\"\\\n-                          \"/pthread-w\" + bit + \".zip\"\n-            tcl_url = \"http://sourceforge.net/projects/netgen-mesher/files\"\\\n+        #for now, use netgen's pre-compiled dependencies\n+        if not os.path.exists(\"..\\\\ext_libs\"):\n+            os.mkdir(\"..\\\\ext_libs\")\n+        bit = \"32\"\n+        if libpack.arch == \"x64\": bit = \"64\"\n+        \n+        pthread_url = \"http://sourceforge.net/projects/netgen-mesher/files\"\\\n                       \"/netgen-mesher/Additional%20Files/MSVC2008_Libs\"\\\n-                      \"/TclTkTixTogl-w\" + bit + \".zip\"\n-            pthread_dirname = os.path.basename(pthread_url).split(\".\")[0]\n-            tcl_dirname = os.path.basename(tcl_url).split(\".\")[0]\n-            utils.get_source({\"type\":\"archive\", \"url\":pthread_url},\n-                              \"..\\\\ext_libs\", pthread_dirname)\n-            utils.get_source({\"type\":\"archive\", \"url\":tcl_url},\n-                              \"..\\\\ext_libs\", tcl_dirname)\n+                      \"/pthread-w\" + bit + \".zip\"\n+        tcl_url = \"http://sourceforge.net/projects/netgen-mesher/files\"\\\n+                  \"/netgen-mesher/Additional%20Files/MSVC2008_Libs\"\\\n+                  \"/TclTkTixTogl-w\" + bit + \".zip\"\n+        pthread_dirname = os.path.basename(pthread_url).split(\".\")[0]\n+        tcl_dirname = os.path.basename(tcl_url).split(\".\")[0]\n+        utils.get_source({\"type\":\"archive\", \"url\":pthread_url},\n+                          \"..\\\\ext_libs\", pthread_dirname)\n+        utils.get_source({\"type\":\"archive\", \"url\":tcl_url},\n+                          \"..\\\\ext_libs\", tcl_dirname)\n \n-            patches = [\"vcproj\", \"occ67_1\", \"occ67_2\", \"occ67_3\", \n-                       \"dllexport1\", \"dllexport2\", \"dllexport3\", \"dllexport4\"]\n-            for n in patches:\n-                filename = \"..\\\\patches\\\\netgen_{0}.diff\".format(n)\n-                utils.apply_patch(os.path.join(os.path.dirname(__file__),\n-                                  filename))\n+        patches = [\"vcproj\", \"occ67_1\", \"occ67_2\", \"occ67_3\", \n+                   \"dllexport1\", \"dllexport2\", \"dllexport3\", \"dllexport4\"]\n+        for n in patches:\n+            filename = \"..\\\\patches\\\\netgen_{0}.diff\".format(n)\n+            utils.apply_patch(os.path.join(os.path.dirname(__file__),\n+                              filename))\n \n-            os.environ[\"LIB\"] = os.environ[\"LIB\"] + libpack.path + \"\\\\lib\"\n-            os.environ[\"INCLUDE\"] = os.environ[\"INCLUDE\"] + libpack.path \\\n-                                    + \"\\\\include\\\\oce;\"\n-            tcl_include = libpack.config.get(\"Paths\", \"workspace\") \\\n-                          + \"\\\\ext_libs\\\\\" + tcl_dirname + \"\\\\include;\"\n-            os.environ[\"INCLUDE\"] = os.environ[\"INCLUDE\"] + tcl_include\n+        os.environ[\"LIB\"] = os.environ[\"LIB\"] + libpack.path + \"\\\\lib\"\n+        os.environ[\"INCLUDE\"] = os.environ[\"INCLUDE\"] + libpack.path \\\n+                                + \"\\\\include\\\\oce;\"\n+        tcl_include = libpack.config.get(\"Paths\", \"workspace\") \\\n+                      + \"\\\\ext_libs\\\\\" + tcl_dirname + \"\\\\include;\"\n+        os.environ[\"INCLUDE\"] = os.environ[\"INCLUDE\"] + tcl_include\n \n-            print(\"\\nBuilding release...\\n\")\n-            utils.run_cmd(\"vcbuild\", [\"/useenv\", \"windows\\\\nglib.sln\",\n-                                      \"Release(OCC)|Win32\"])\n-            print(\"\\nBuilding debug...\\n\")\n-            utils.run_cmd(\"vcbuild\", [\"/useenv\", \"windows\\\\nglib.sln\",\n-                                      \"Debug|Win32\"])\n+        print(\"\\nBuilding release...\\n\")\n+        libpack.vcbuild(\"windows\\\\nglib.sln\", \"Release(OCC)\", \"Win32\", [\"/useenv\"])","path":"LibPack/BuildFormulas/netgen.py","position":79,"original_position":79,"commit_id":"cf6c1dba9c772c30b798056a10ca0087c03d488c","original_commit_id":"cf6c1dba9c772c30b798056a10ca0087c03d488c","user":{"login":"peterl94","id":5176612,"avatar_url":"https://avatars.githubusercontent.com/u/5176612?","gravatar_id":"af16b62beee496de0131be747a0ab046","url":"https://api.github.com/users/peterl94","html_url":"https://github.com/peterl94","followers_url":"https://api.github.com/users/peterl94/followers","following_url":"https://api.github.com/users/peterl94/following{/other_user}","gists_url":"https://api.github.com/users/peterl94/gists{/gist_id}","starred_url":"https://api.github.com/users/peterl94/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/peterl94/subscriptions","organizations_url":"https://api.github.com/users/peterl94/orgs","repos_url":"https://api.github.com/users/peterl94/repos","events_url":"https://api.github.com/users/peterl94/events{/privacy}","received_events_url":"https://api.github.com/users/peterl94/received_events","type":"User","site_admin":false},"body":"At least in express version, msbuild doesn't recognize /useenve. Shouldn't it be /p:UseEnv=true?","created_at":"2014-03-25T06:26:51Z","updated_at":"2014-03-25T06:26:51Z","html_url":"https://github.com/peterl94/FreeCAD_sf_master/pull/1#discussion_r10918830","pull_request_url":"https://api.github.com/repos/peterl94/FreeCAD_sf_master/pulls/1","_links":{"self":{"href":"https://api.github.com/repos/peterl94/FreeCAD_sf_master/pulls/comments/10918830"},"html":{"href":"https://github.com/peterl94/FreeCAD_sf_master/pull/1#discussion_r10918830"},"pull_request":{"href":"https://api.github.com/repos/peterl94/FreeCAD_sf_master/pulls/1"}}}}