Test moving bsconfig to src. (#151)

* Test moving bsconfig to src. * Changes to CI.
rescript-association · Feb 19, 2019 · 109faef · 109faef
1 parent b2eea60
commit 109faef
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 13 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -43,7 +43,7 @@ jobs:
             - node_modules
 
       # Tar things up
-      - run: tar czvf artifacts/gentype-linux.tar.gz -C lib/bs/native gentype.native
+      - run: tar czvf artifacts/gentype-linux.tar.gz -C src/lib/bs/native gentype.native
 
       - store_artifacts:
           path: artifacts/gentype-linux.tar.gz
@@ -84,7 +84,7 @@ jobs:
             - node_modules
 
       # Tar things up
-      - run: tar czvf artifacts/gentype-macos.tar.gz -C lib/bs/native gentype.native
+      - run: tar czvf artifacts/gentype-macos.tar.gz -C src/lib/bs/native gentype.native
 
       - store_artifacts:
           path: artifacts/gentype-macos.tar.gz

diff --git a/appveyor.yml b/appveyor.yml
@@ -15,8 +15,8 @@ build_script:
     - npm run build
     - npm test
     # Validate binary
-    - lib\bs\native\gentype.native.exe --help
-    - tar czvf gentype-win.tar.gz -C lib\bs\native gentype.native.exe
+    - src\lib\bs\native\gentype.native.exe --help
+    - tar czvf gentype-win.tar.gz -C src\lib\bs\native gentype.native.exe
 
 artifacts:
     - path: gentype-win.tar.gz

diff --git a/create-release.sh b/create-release.sh
@@ -6,7 +6,7 @@ rm -f lib/gentype-*.tar.gz
 # MacOS
 npm install
 npm run clean && npm run build && npm run test
-tar czvf lib/gentype-macos.tar.gz  -C lib/bs/native gentype.native
+tar czvf lib/gentype-macos.tar.gz  -C src/lib/bs/native gentype.native
 
 
 # Linux
@@ -16,4 +16,4 @@ docker build -t gentype .
 # Mounts only the lib and src volume and runs `npm run build`
 docker run -it -v $PWD/lib:/genType/lib -v $PWD/src:/genType/src gentype bash -c "npm run clean && npm run build"
 
-tar czvf lib/gentype-linux.tar.gz  -C lib/bs/native gentype.native
+tar czvf lib/gentype-linux.tar.gz  -C src/lib/bs/native gentype.native
diff --git a/examples/clean_bsb.js b/examples/clean_bsb.js
@@ -11,7 +11,7 @@ const spawn = child_process.spawn;
 const isWindows = /^win/i.test(process.platform);
 
 function genTypeNativePath() {
-  const base = path.join(__dirname, "..", "lib", "bs", "native");
+  const base = path.join(__dirname, "..", "src", "lib", "bs", "native");
   if (isWindows) {
     return path.join(base, "gentype.native.exe");
   } else {

diff --git a/examples/run_bsb.js b/examples/run_bsb.js
@@ -11,7 +11,7 @@ const spawn = child_process.spawn;
 const isWindows = /^win/i.test(process.platform);
 
 function genTypeNativePath() {
-  const base = path.join(__dirname, "..", "lib", "bs", "native");
+  const base = path.join(__dirname, "..", "src", "lib", "bs", "native");
   if (isWindows) {
     return path.join(base, "gentype.native.exe");
   } else {

diff --git a/package.json b/package.json
@@ -5,9 +5,9 @@
   "description": "Use Reason values from Javascript: vanilla, or TypeScript/FlowType-annotated",
   "license": "MIT",
   "scripts": {
-    "start": "bsb -make-world -backend native -w",
-    "build": "bsb -make-world -backend native",
-    "clean": "bsb -clean-world",
+    "start": "cd src && bsb -make-world -backend native -w",
+    "build": "cd src && bsb -make-world -backend native",
+    "clean": "cd src && bsb -clean-world",
     "test": "node ./scripts/run_integration_tests.js",
     "install:examples": "(cd examples/flow-react-example && npm install) & (cd examples/typescript-react-example && npm install) & (cd examples/untyped-react-example && npm install) & (cd examples/commonjs-react-example && npm install)",
     "build:examples": "(cd examples/flow-react-example && npm run clean && npm run build) & (cd examples/typescript-react-example && npm run clean && npm run build) & (cd examples/untyped-react-example && npm run clean && npm run build) & (cd examples/commonjs-react-example && npm run clean && npm run build)",

diff --git a/scripts/run_integration_tests.js b/scripts/run_integration_tests.js
@@ -22,7 +22,7 @@ const exampleDirPaths = [
 const isWindows = /^win/i.test(process.platform);
 
 function getGenTypeFilePath() {
-  const base = path.join(__dirname, "..", "lib", "bs", "native");
+  const base = path.join(__dirname, "..", "src", "lib", "bs", "native");
   if (isWindows) {
     return path.join(base, "gentype.native.exe");
   } else {

diff --git a/bsconfig.json → src/bsconfig.json b/bsconfig.json → src/bsconfig.json
@@ -2,7 +2,7 @@
   "name": "refactor",
   "sources": [
     {
-      "dir": "src",
+      "dir": ".",
       "subdirs": true
     }
   ],