Get graph module compiled

4 files changed, 35 insertions, 11 deletions

diff --git a/build_windows.bat b/build_windows.bat
index bd58858..3125339 100644
--- a/build_windows.bat
+++ b/build_windows.bat
@@ -126,7 +126,7 @@ cd %THIS_DIR%extra\nn
 cmd /c luarocks make rocks/nn-scm-1.rockspec

 if errorlevel 1 goto :error

 cd %THIS_DIR%extra\graph

-cmd /c luarocks make rocks/graph-scm-1.rockspec

+cmd /c luarocks make %Base%/win-files/graph-scm-1.rockspec

 if errorlevel 1 goto :error

 cd %THIS_DIR%extra\nngraph

 cmd /c luarocks make

@@ -140,14 +140,6 @@ if errorlevel 1 goto :error
 

 popd

 

-(

-echo set "LUA_CPATH=%BASE%/install/?.DLL;%BASE%/install/LIB/?.DLL;?.DLL"

-echo set "LUA_DEV=%BASE%/install"

-echo set "LUA_PATH=;;%BASE%/install/?;%BASE%/install/?.lua;%BASE%/install/lua/?;%BASE%/install/lua/?.lua;%BASE%/install/lua/?/init.lua

-echo set "PATH=%PATH%;%BASE%\install;%BASE%\install\bin"

-) > %BASE%\install\torch-active.bat

-

-

 luajit -e "require('torch')"

 if errorlevel 1 exit /B 1

 

diff --git a/torch-active.bat b/torch-active.bat
new file mode 100644
index 0000000..c36e2bb
--- /dev/null
+++ b/torch-active.bat
@@ -0,0 +1,5 @@
+set BASE=%~dp0
+set "LUA_CPATH=%BASE%/install/?.DLL;%BASE%/install/LIB/?.DLL;?.DLL"
+set "LUA_DEV=%BASE%/install"
+set "LUA_PATH=%BASE%/install/?;%BASE%/install/luarocks/?;%BASE%/install/luarocks/?.lua;%BASE%/install/pkg/?;%BASE%/install/pkg/?.lua;%BASE%/install/?.lua;%BASE%/install/lua/?.lua;%BASE%/install/lua/?/init.lua"
+set "PATH=%PATH%;%BASE%\install;%BASE%\install\bin"
\ No newline at end of file
diff --git a/win-files/graph-scm-1.rockspec b/win-files/graph-scm-1.rockspec
new file mode 100644
index 0000000..1260131
--- /dev/null
+++ b/win-files/graph-scm-1.rockspec
@@ -0,0 +1,27 @@
+package = "graph"
+version = "scm-1"
+
+source = {
+   url = "git://github.com/torch/graph",
+   tag = "master"
+}
+
+description = {
+   summary = "Graph package for Torch",
+   homepage = "https://github.com/torch/graph",
+   license = "UNKNOWN"
+}
+
+dependencies = {
+   "torch >= 7.0"
+}
+
+build = {
+   type = "builtin",
+   modules = {
+    ['graph.init'] = 'init.lua',
+    ['graph.graphviz'] = 'graphviz.lua',
+    ['graph.Node'] = 'Node.lua',
+    ['graph.Edge'] = 'Edge.lua'
+   }
+}
diff --git a/win-files/sys-1.1-0.rockspec b/win-files/sys-1.1-0.rockspec
index 3344b53..704f621 100644
--- a/win-files/sys-1.1-0.rockspec
+++ b/win-files/sys-1.1-0.rockspec
@@ -23,11 +23,11 @@ build = {
    modules = {
       ['sys.init'] = 'init.lua',
       ['sys.fpath'] = 'fpath.lua',
-      ['sys.color'] = 'colors.lua',
+      ['sys.colors'] = 'colors.lua',
       libsys = {
          sources = {
             "sys.c"
          }
       }
-   },
+   }
 }