removed symlinks

diff --git a/.npmignore b/.npmignore
new file mode 100644 (file)
index 0000000..dfea689
--- /dev/null
+++ b/.npmignore
@@ -0,0 +1,3 @@
+.git
+npm-debug.log
+.sw*

diff --git a/enyo-client/application/enyo b/enyo-client/application/enyo
deleted file mode 160000 (submodule)
index adb4dc2..0000000
--- a/enyo-client/application/enyo
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit adb4dc23d096bb1648b8369e5da0ca39e43b1e0d

diff --git a/enyo-client/application/lib b/enyo-client/application/lib
deleted file mode 120000 (symlink)
index 58677dd..0000000
--- a/enyo-client/application/lib
+++ /dev/null
@@ -1 +0,0 @@
-../../lib
\ No newline at end of file

diff --git a/enyo-client/application/source/ext/package.js b/enyo-client/application/source/ext/package.js
index 9baa8cb..dd84a38 100644 (file)
--- a/enyo-client/application/source/ext/package.js
+++ b/enyo-client/application/source/ext/package.js
@@ -1,5 +1,5 @@
 enyo.depends(
-  "../../lib/module/rjson/rjson.js",
+  "../../../../node_modules/rjson/rjson.js",
   "core.js",
   "datasource.js",
   "session.js"

diff --git a/enyo-client/application/source/package.js b/enyo-client/application/source/package.js
index f84ee3a..af3ac8b 100644 (file)
--- a/enyo-client/application/source/package.js
+++ b/enyo-client/application/source/package.js
@@ -1,8 +1,8 @@
 enyo.depends(
   "preliminaries.js",
-  "../lib/tools",
-  "../lib/backbone-x",
-  "../lib/enyo-x",
+  "../../../lib/tools",
+  "../../../lib/backbone-x",
+  "../../../lib/enyo-x",
   "ext",
   "models",
   "widgets",

diff --git a/enyo-client/application/tools/deploy.sh b/enyo-client/application/tools/deploy.sh
index f2f4984..157619a 100755 (executable)
--- a/enyo-client/application/tools/deploy.sh
+++ b/enyo-client/application/tools/deploy.sh
@@ -9,7 +9,7 @@ FOLDER=deploy
 SUFFIX=`date "+-%Y_%m_%d-%I_%M_%S%p"`
 
 # The grandparent folder for this script
-SOURCE=$(cd `dirname $0`/../; pwd)
+SOURCE=$(pwd)/..
 
 # extract project folder name
 NAME=${SOURCE##*/}
@@ -48,7 +48,7 @@ mkdir -p "$TARGET/lib"
 # copy assets and build
 cp -r "$SOURCE/../../node-datasource/views/login/assets" "$SOURCE/build" "$TARGET"
 
-for i in "$SOURCE/lib/"*; do
+for i in "$SOURCE/../../lib/"*; do
        o=${i##*/}
        if [ -x $i/deploy.sh ]; then
                echo "Deploying $o"

diff --git a/enyo-client/application/tools/minify.sh b/enyo-client/application/tools/minify.sh
index 598eb25..101e4af 100755 (executable)
--- a/enyo-client/application/tools/minify.sh
+++ b/enyo-client/application/tools/minify.sh
@@ -1,11 +1,13 @@
 #!/bin/bash
 
 cd `dirname $0`
+PWD=$(pwd)
 
 # build enyo
-pushd ../enyo/minify > /dev/null
-./minify.sh
-popd > /dev/null
+pushd ../../../lib/enyo-x/enyo
+./tools/deploy.js -p source/package.js
+cp build/enyo.* ../../../enyo-client/application/build/
+popd
 
 # build app
-../enyo/tools/minify.sh package.js -output ../build/app
+../../../lib/enyo-x/enyo/tools/minify.sh package.js -output ../build/app

diff --git a/lib/module b/lib/module
deleted file mode 120000 (symlink)
index ea095f3..0000000
--- a/lib/module
+++ /dev/null
@@ -1 +0,0 @@
-../node_modules/
\ No newline at end of file

diff --git a/lib/tools/lib/package.js b/lib/tools/lib/package.js
index cc96c8d..878cc6b 100644 (file)
--- a/lib/tools/lib/package.js
+++ b/lib/tools/lib/package.js
@@ -4,5 +4,5 @@ depends(
   "async/lib/async.js",
   "globalize/lib/globalize.js",
   "globalize/lib/globalize.js",
-  '../../module/moment/moment.js'
+  '../../../node_modules/moment/moment.js'
 );

diff --git a/package.json b/package.json
index 68abcc5..453485c 100644 (file)
--- a/package.json
+++ b/package.json
@@ -7,6 +7,14 @@
     "type": "git",
     "url": "https://github.com/xtuple/xtuple.git"
   },
+  "files": [
+    "enyo-client",
+    "foundation-database",
+    "lib",
+    "node-datasource",
+    "scripts",
+    "test"
+  ],
   "dependencies": {
     "async": "0.2.x",
     "backbone": "0.9.10",

diff --git a/scripts/lib/build_client.js b/scripts/lib/build_client.js
index 7fe466a..201c366 100755 (executable)
--- a/scripts/lib/build_client.js
+++ b/scripts/lib/build_client.js
@@ -236,7 +236,7 @@ var _ = require('underscore'),
       //
       fs.exists(enyoDir, function (exists) {
         if (!exists) {
-          fs.symlink(path.join(__dirname, "../../enyo-client/application/enyo"), enyoDir, function (err) {
+          fs.symlink(path.join(__dirname, "../../lib/enyo-x/enyo"), enyoDir, function (err) {
             if (err) {
               callback(err);
               return;