new rocks

torch · Jul 4, 2013 · 164dfdc · 164dfdc
1 parent 0d2788d
commit 164dfdc
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 42 deletions.
diff --git a/index.html b/index.html
@@ -171,7 +171,7 @@ <h1>Available rocks</h1>
 <font size="-1"><a href="git://github.com/clementfarabet/lua---nnx">latest sources</a> | <a href="https://github.com/clementfarabet/lua---nnx" target="_blank">project homepage</a> | License: BSD</font></p>
 </blockquote></a></td>
 <td class="version">
-0.1-1:&nbsp;<a href="nnx-0.1-1.rockspec">rockspec</a><br/>0.1-0:&nbsp;<a href="nnx-0.1-0.rockspec">rockspec</a><br/></td></tr>
+0.1-1:&nbsp;<a href="nnx-0.1-1.rockspec">rockspec</a><br/></td></tr>
 <tr><td colspan="2" class="spacer"></td></tr>
 <td class="package">
 <p><a name="optim"></a><b>optim</b> - An optimization library for Torch.<br/>

diff --git a/manifest b/manifest
@@ -103,11 +103,6 @@ repository = {
       }
    },
    nnx = {
-      ['0.1-0'] = {
-         {
-            arch = "rockspec"
-         }
-      },
       ['0.1-1'] = {
          {
             arch = "rockspec"

diff --git a/mattorch-1.0-0.rockspec b/mattorch-1.0-0.rockspec
@@ -24,8 +24,12 @@ dependencies = {
 }
 
 build = {
-   type = "cmake",
-   variables = {
-      LUAROCKS_PREFIX = "$(PREFIX)"
-   }
+   type = "command",
+   build_command = [[
+cmake -E make_directory build;
+cd build;
+cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$(LUA_BINDIR)/.." -DCMAKE_INSTALL_PREFIX="$(PREFIX)"; 
+$(MAKE)
+   ]],
+   install_command = "cd build && $(MAKE) install"
 }
diff --git a/nnx-0.1-0.rockspec b/nnx-0.1-0.rockspec