add build system

.gitignore

@@ -10,3 +10,7 @@ plugins/
 *.apk
 icon*x*.png
 build_release.sh
+
+./www/lib/*
+./www/fonts/*
+./www/dist/*

bower.json

@@ -1,13 +1,12 @@
 {
-  "name": "myApp",
-  "private": "true",
-  "devDependencies": {
-    "ionic": "driftyco/ionic-bower#1.0.0-beta.14"
-  },
-  "dependencies": {
-    "angular-local-storage": "~0.1.5",
-    "pixi": "~2.2.3",
-    "Faker": "~2.1.2",
-    "ionicons": "~2.0.1"
-  }
+    "name": "myApp",
+    "private": "true",
+    "devDependencies": {
+    },
+    "dependencies": {
+        "ionic": "driftyco/ionic-bower#1.0.0-rc.0",
+        "angular-local-storage": "~0.1.5",
+        "pixi": "~2.2.3",
+        "Faker": "~2.1.2"
+    }
 }

gulpfile.js

@@ -13,10 +13,21 @@ var gulpFilter = require('gulp-filter');
 
 var paths = {
     sass: ['./scss/**/*.scss'],
-    jsProject: ['./www/js/**/*.js'],
+    jsProject: [
+        "./www/js/catan/js/catan.js",
+        "./www/js/catan/js/hexagon.js",
+        "./www/js/catan/js/map.js",
+        "./www/js/catan/js/tools.js",
+        "./www/js/catan/js/ui.js",
+        "./www/js/catan/js/position.js",
+        "./www/js/catan/js/generator/generator.js",
+        "./www/js/catan/js/generator/generator.land.js",
+        "./www/js/catan/js/generator/generator.number.js",
+        "./www/js/catan/js/generator/generator.harbor.js",
+        './www/js/**/*.js'],
     jsProjectTarget: 'project.js',
     jsVendorTarget: 'vendor.js',
-    cssProject: ['./www/css/**/*.css'],
+    cssProject: ['./www/css/style.css'],
     cssProjectTarget: 'project.css',
     cssVendorTarget: 'vendor.css',
     dist: 'www/dist'
@@ -26,9 +37,7 @@ gulp.task('default', ['sass']);
 
 gulp.task('sass', function (done) {
     gulp.src('./scss/ionic.app.scss')
-        .pipe(sourcemaps.init())
         .pipe(sass())
-        .pipe(sourcemaps.write())
         .pipe(gulp.dest('./www/css/from_scss'))
         .on('end', done);
 });
@@ -60,37 +69,39 @@ gulp.task('git-check', function (done) {
 });
 
 
+gulp.task('build', function() {
+    gulp.start('sass');
+    gulp.start('js-concat-project');
+    gulp.start('js-concat-vendor');
+    gulp.start('css-concat-project');
+    gulp.start('css-concat-vendor');
+    gulp.start('fonts-concat-vendor');
+});
+
+
 gulp.task('js-concat-project', function () {
     return gulp.src(paths.jsProject)
-        .pipe(sourcemaps.init())
         .pipe(concat(paths.jsProjectTarget))
-        .pipe(sourcemaps.write())
         .pipe(gulp.dest(paths.dist));
 });
 
 gulp.task('js-concat-vendor', function () {
     return gulp.src(mainBowerFiles())
         .pipe(gulpFilter('**/*.js'))
-        .pipe(sourcemaps.init())
         .pipe(concat(paths.jsVendorTarget))
-        .pipe(sourcemaps.write())
         .pipe(gulp.dest(paths.dist));
 });
 
 gulp.task('css-concat-project', function () {
     return gulp.src(paths.cssProject)
-        .pipe(sourcemaps.init())
         .pipe(concat(paths.cssProjectTarget))
-        .pipe(sourcemaps.write())
         .pipe(gulp.dest(paths.dist));
 });
 
 gulp.task('css-concat-vendor', function () {
     return gulp.src(mainBowerFiles())
         .pipe(gulpFilter('**/*.css'))
-        .pipe(sourcemaps.init())
         .pipe(concat(paths.cssVendorTarget))
-        .pipe(sourcemaps.write())
         .pipe(gulp.dest(paths.dist));
 });
 

hooks/after_prepare/025_remove_non_dist_from_platforms.js

@@ -21,8 +21,13 @@ var deleteFolderRecursive = function(removePath) {
   }
 };
 
-var iosPlatformsDir = path.resolve(__dirname, '../../platforms/ios/www/lib/ionic/scss');
-var androidPlatformsDir = path.resolve(__dirname, '../../platforms/android/assets/www/lib/ionic/scss');
+var wwwPrefixes = [
+    //'../../platforms/ios/www',
+    '../../platforms/android/assets/www'
+];
 
-deleteFolderRecursive(iosPlatformsDir);
-deleteFolderRecursive(androidPlatformsDir);
+for (var i = 0 ; i < wwwPrefixes.length ; i++) {
+    deleteFolderRecursive(path.resolve(__dirname, wwwPrefixes[i] + '/lib'));
+    deleteFolderRecursive(path.resolve(__dirname, wwwPrefixes[i] + '/js'));
+    deleteFolderRecursive(path.resolve(__dirname, wwwPrefixes[i] + '/css'));
+}

hooks/before_prepare/15_run_gulp_build_tasks.js

@@ -1,7 +1,9 @@
+#!/usr/bin/env node
+
+console.log('Building project dist');
 var gulp = require('gulp');
 var path = require('path');
 
 require(path.resolve(__dirname, '../../gulpfile.js'));
 
-console.log('Building project');
 gulp.start('build');

ionic.project

@@ -2,12 +2,7 @@
   "name": "myApp",
   "app_id": "",
   "gulpStartupTasks": [
-      "js-concat-project",
-      "js-concat-vendor",
-      "css-concat-project",
-      "css-concat-vendor",
-      "fonts-concat-vendor",
-      "sass",
+      "build",
       "watch"
     ]
 }

www/index.html

@@ -5,44 +5,16 @@
     <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no, width=device-width">
     <title></title>
 
-    <link href="lib/ionic/css/ionic.css" rel="stylesheet">
-    <link href="lib/ionicons/css/ionicons.min.css" rel="stylesheet">
-    <link href="css/style.css" rel="stylesheet">
+    <link href="dist/vendor.css" rel="stylesheet">
+    <link href="dist/project.css" rel="stylesheet">
 
-    <!-- IF using Sass (run gulp sass first), then uncomment below and remove the CSS includes above
-    <link href="css/ionic.app.css" rel="stylesheet">
-    -->
-
-    <!-- ionic/angularjs js -->
-    <script src="lib/ionic/js/ionic.bundle.min.js"></script>
-    <!-- ionic/angularjs js -->
-    <script src="lib/angular-local-storage/dist/angular-local-storage.min.js"></script>
-
-    <!-- goodboydigital/pixi -->
-    <script src="lib/pixi/bin/pixi.js"></script>
-
-    <!-- faker/faker js -->
-    <script src="lib/Faker/build/build/faker.min.js"></script>
-
-    <!-- catan/catan js -->
-    <script src="js/catan/js/catan.js"></script>
-    <script src="js/catan/js/hexagon.js"></script>
-    <script src="js/catan/js/map.js"></script>
-    <script src="js/catan/js/tools.js"></script>
-    <script src="js/catan/js/ui.js"></script>
-    <script src="js/catan/js/position.js"></script>
-    <script src="js/catan/js/generator/generator.js"></script>
-    <script src="js/catan/js/generator/generator.land.js"></script>
-    <script src="js/catan/js/generator/generator.number.js"></script>
-    <script src="js/catan/js/generator/generator.harbor.js"></script>
+    <script src="dist/vendor.js"></script>
 
     <!-- cordova script (this will be a 404 during development) -->
     <script src="cordova.js"></script>
 
     <!-- your app's js -->
-    <script src="js/app.js"></script>
-    <script src="js/controllers.js"></script>
-    <script src="js/services.js"></script>
+    <script src="dist/project.js"></script>
 </head>
 <body ng-app="starter">
 <!--

www/templates/tabs.html

@@ -16,7 +16,7 @@
     </ion-tab>
 
     <!-- Settings Tab -->
-    <ion-tab title="Settings" icon-off="ion-ios7-gear-outline" icon-on="ion-ios7-gear" href="#/tab/settings">
+    <ion-tab title="Settings" icon-off="ion-ios-gear" icon-on="ion-ios-gear" href="#/tab/settings">
         <ion-nav-view name="tab-settings"></ion-nav-view>
     </ion-tab>