bring package.json and bower.json to root so we can install this with…

… bower again
plone · Mar 31, 2015 · 1748aa3 · 1748aa3
1 parent d3fd716
commit 1748aa3
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 22 deletions.
diff --git a/.bowerrc b/.bowerrc
@@ -0,0 +1,3 @@
+{
+  "directory" : "mockup/bower_components"
+}
diff --git a/.travis.yml b/.travis.yml
@@ -17,7 +17,6 @@ env:
     - BROWSERS="SL_IPad"
     - BROWSERS="SL_Android"
 install:
-  - cd mockup
   - travis_retry make bootstrap
   - echo "Host github.com" >> ~/.ssh/config
   - echo "   StrictHostKeyChecking no" >> ~/.ssh/config

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,6 +4,9 @@ Changelog
 2.0.0 (unreleased)
 ------------------
 
+- make sure mockup can be installable with bower again
+  [vangheem]
+
 - Bring back TinyMCE ``sed`` and ``copy`` from ``mockup`` into ``mockup-core``.
   If we create bundles from an external package based on patterns from mockup,
   we don't want to care about the sed and copy tasks too. Instead, those should

diff --git a/mockup/Makefile → Makefile b/mockup/Makefile → Makefile
@@ -38,30 +38,30 @@ bundles: stamp-bower bundle-widgets bundle-structure bundle-plone
 
 bundle-widgets:
 	mkdir -p build
-	NODE_PATH=$(NODE_PATH) $(GRUNT) bundle-widgets $(DEBUG) $(VERBOSE)
+	NODE_PATH=$(NODE_PATH) $(GRUNT) bundle-widgets $(DEBUG) $(VERBOSE) --gruntfile=mockup/Gruntfile.js
 
 bundle-structure:
-	NODE_PATH=$(NODE_PATH) $(GRUNT) bundle-structure $(DEBUG) $(VERBOSE)
+	NODE_PATH=$(NODE_PATH) $(GRUNT) bundle-structure $(DEBUG) $(VERBOSE) --gruntfile=mockup/Gruntfile.js
 
 bundle-plone:
 	mkdir -p build
-	NODE_PATH=$(NODE_PATH) $(GRUNT) bundle-plone $(DEBUG) $(VERBOSE)
+	NODE_PATH=$(NODE_PATH) $(GRUNT) bundle-plone $(DEBUG) $(VERBOSE) --gruntfile=mockup/Gruntfile.js
 
 bundle-filemanager:
-	NODE_PATH=$(NODE_PATH) $(GRUNT) bundle-filemanager $(DEBUG) $(VERBOSE)
+	NODE_PATH=$(NODE_PATH) $(GRUNT) bundle-filemanager $(DEBUG) $(VERBOSE) --gruntfile=mockup/Gruntfile.js
 
 bundle-resourceregistry:
-	NODE_PATH=$(NODE_PATH) $(GRUNT) bundle-resourceregistry $(DEBUG) $(VERBOSE)
+	NODE_PATH=$(NODE_PATH) $(GRUNT) bundle-resourceregistry $(DEBUG) $(VERBOSE) --gruntfile=mockup/Gruntfile.js
 
 docs:
 	if test ! -d docs; then $(GIT) clone git://github.com/plone/mockup.git -b gh-pages docs; fi
 	rm -rf docs/dev
-	NODE_PATH=$(NODE_PATH) $(GRUNT) bundle-docs $(DEBUG) $(VERBOSE)
+	NODE_PATH=$(NODE_PATH) $(GRUNT) bundle-docs $(DEBUG) $(VERBOSE) --gruntfile=mockup/Gruntfile.js
 
 bootstrap-common:
 	mkdir -p build
 
-bootstrap: clean bootstrap-common
+bootstrap: bootstrap-common
 	@echo node version: $(NODE_VERSION)
 ifeq ($(NODE_VERSION_LT_011),true)
 	# for node < v0.11.x
@@ -73,39 +73,39 @@ else
 	$(NPM) link
 endif
 	NODE_PATH=$(NODE_PATH) $(BOWER) install --config.interactive=0
-	NODE_PATH=$(NODE_PATH) $(GRUNT) sed:bootstrap $(DEBUG) $(VERBOSE)
+	NODE_PATH=$(NODE_PATH) $(GRUNT) sed:bootstrap $(DEBUG) $(VERBOSE) --gruntfile=mockup/Gruntfile.js
 
 bootstrap-nix: clean bootstrap-common
 	nix-build default.nix -A build -o nixenv
 	ln -s nixenv/lib/node_modules/mockup/node_modules
 	ln -s nixenv/bower_components
 
 jshint:
-	NODE_PATH=$(NODE_PATH) $(GRUNT) jshint jscs $(DEBUG) $(VERBOSE)
+	NODE_PATH=$(NODE_PATH) $(GRUNT) jshint jscs $(DEBUG) $(VERBOSE) --gruntfile=mockup/Gruntfile.js
 
 watch:
-	NODE_PATH=$(NODE_PATH) $(GRUNT) watch $(DEBUG) $(VERBOSE)
+	NODE_PATH=$(NODE_PATH) $(GRUNT) watch $(DEBUG) $(VERBOSE) --gruntfile=mockup/Gruntfile.js
 
 test:
-	NODE_PATH=$(NODE_PATH) $(GRUNT) test $(DEBUG) $(VERBOSE) --pattern=$(pattern)
+	NODE_PATH=$(NODE_PATH) $(GRUNT) test $(DEBUG) $(VERBOSE) --gruntfile=mockup/Gruntfile.js --pattern=$(pattern)
 
 test-once: stamp-bower
-	NODE_PATH=$(NODE_PATH) $(GRUNT) test_once $(DEBUG) $(VERBOSE) --pattern=$(pattern)
+	NODE_PATH=$(NODE_PATH) $(GRUNT) test_once $(DEBUG) $(VERBOSE) --gruntfile=mockup/Gruntfile.js --pattern=$(pattern)
 
 test-dev:
-	NODE_PATH=$(NODE_PATH) $(GRUNT) test_dev $(DEBUG) $(VERBOSE) --pattern=$(pattern)
+	NODE_PATH=$(NODE_PATH) $(GRUNT) test_dev $(DEBUG) $(VERBOSE) --gruntfile=mockup/Gruntfile.js --pattern=$(pattern)
 
 test-serve:
-	NODE_PATH=$(NODE_PATH) $(GRUNT) test_serve $(DEBUG) $(VERBOSE) --pattern=$(pattern)
+	NODE_PATH=$(NODE_PATH) $(GRUNT) test_serve $(DEBUG) $(VERBOSE) --gruntfile=mockup/Gruntfile.js --pattern=$(pattern)
 
 test-ci:
-	NODE_PATH=$(NODE_PATH) $(GRUNT) test_ci $(DEBUG) $(VERBOSE)
+	NODE_PATH=$(NODE_PATH) $(GRUNT) test_ci $(DEBUG) $(VERBOSE) --gruntfile=mockup/Gruntfile.js
 
 clean:
 	mkdir -p build
 	rm -rf build
 	rm -rf node_modules
-	rm -rf bower_components
+	rm -rf mockup/bower_components
 	rm -f stamp-npm stamp-bower
 	rm -rf node_modules src/bower_components
 

diff --git a/mockup/bower.json → bower.json b/mockup/bower.json → bower.json
diff --git a/mockup/Gruntfile.js b/mockup/Gruntfile.js
@@ -30,12 +30,12 @@ module.exports = function(grunt) {
       docs: {
         files: [
           { expand: true, src: 'index.html', dest: 'docs/dev/' },
-          { expand: true, src: '*.md', dest: 'docs/dev/' },
+          { expand: true, src: '../*.md', dest: 'docs/dev/' },
           { expand: true, src: 'js/**', dest: 'docs/dev/' },
           { expand: true, src: 'tests/**', dest: 'docs/dev/' },
           { expand: true, src: 'lib/**', dest: 'docs/dev/' },
           { expand: true, src: 'bower_components/**', dest: 'docs/dev/' },
-          { expand: true, src: 'node_modules/requirejs/require.js', dest: 'docs/dev/' },
+          { expand: true, src: '../node_modules/requirejs/require.js', dest: 'docs/dev/' },
           { expand: true, src: 'build/**', dest: 'docs/dev/' },
           { expand: true, src: 'less/**', dest: 'docs/dev/' }
         ]
@@ -73,7 +73,7 @@ module.exports = function(grunt) {
   mockup.initGrunt(grunt, {
     sed: {
       bootstrap: {
-        path: 'node_modules/lcov-result-merger/index.js',
+        path: '../node_modules/lcov-result-merger/index.js',
         pattern: 'throw new Error\\(\'Unknown Prefix ',
         replacement: '//throw// new Error(\'Unknown Prefix '
       }

diff --git a/mockup/index.html b/mockup/index.html
@@ -20,14 +20,14 @@
   <![endif]-->
 
   <script src="node_modules/requirejs/require.js"></script>
-  <script src="js/config.js"></script>
+  <script src="mockup/js/config.js"></script>
   <script>
     window.DEBUG = true;
     require(['mockup-bundles-docs']);
   </script>
 </head>
 
-<body data-i18ncatalogurl="/tests/json/i18n.json">
+<body data-i18ncatalogurl="/mockup/tests/json/i18n.json">
 </body>
 
 </html>
diff --git a/mockup/node_modules b/mockup/node_modules
@@ -0,0 +1 @@
+../node_modules
diff --git a/mockup/package.json → package.json b/mockup/package.json → package.json