Move src files

gulpfile.js

@@ -26,9 +26,9 @@ const RELEASE_DIR = './release/';
 var nwBuilderOptions = {
     version: '0.27.4',
     files: './dist/**/*',
-    macIcns: './images/bf_icon.icns',
+    macIcns: './src/images/bf_icon.icns',
     macPlist: { 'CFBundleDisplayName': 'Betaflight Configurator'},
-    winIco: './images/bf_icon.ico'
+    winIco: './src/images/bf_icon.ico'
 };
 
 //-----------------
@@ -200,128 +200,128 @@ function clean_cache() {
 function dist() {
     var distSources = [
         // CSS files
-        './main.css',
-        './tabs/power.css',
-        './tabs/firmware_flasher.css',
-        './tabs/onboard_logging.css',
-        './tabs/receiver.css',
-        './tabs/cli.css',
-        './tabs/servos.css',
-        './tabs/adjustments.css',
-        './tabs/configuration.css',
-        './tabs/auxiliary.css',
-        './tabs/pid_tuning.css',
-        './tabs/transponder.css',
-        './tabs/gps.css',
-        './tabs/led_strip.css',
-        './tabs/sensors.css',
-        './tabs/osd.css',
-        './tabs/motors.css',
-        './tabs/receiver_msp.css',
-        './tabs/logging.css',
-        './tabs/landing.css',
-        './tabs/setup_osd.css',
-        './tabs/help.css',
-        './tabs/failsafe.css',
-        './tabs/ports.css',
-        './tabs/setup.css',
-        './css/opensans_webfontkit/fonts.css',
-        './css/dropdown-lists/css/style_lists.css',
-        './css/font-awesome/css/font-awesome.min.css',
-        './js/libraries/flightindicators.css',
-        './js/libraries/jbox/jBox.css',
-        './js/libraries/jbox/themes/NoticeBorder.css',
-        './js/libraries/jbox/themes/ModalBorder.css',
-        './js/libraries/jbox/themes/TooltipDark.css',
-        './js/libraries/jbox/themes/TooltipBorder.css',
-        './js/libraries/jquery.nouislider.pips.min.css',
-        './js/libraries/switchery/switchery.css',
-        './js/libraries/jquery.nouislider.min.css',
+        './src/main.css',
+        './src/tabs/power.css',
+        './src/tabs/firmware_flasher.css',
+        './src/tabs/onboard_logging.css',
+        './src/tabs/receiver.css',
+        './src/tabs/cli.css',
+        './src/tabs/servos.css',
+        './src/tabs/adjustments.css',
+        './src/tabs/configuration.css',
+        './src/tabs/auxiliary.css',
+        './src/tabs/pid_tuning.css',
+        './src/tabs/transponder.css',
+        './src/tabs/gps.css',
+        './src/tabs/led_strip.css',
+        './src/tabs/sensors.css',
+        './src/tabs/osd.css',
+        './src/tabs/motors.css',
+        './src/tabs/receiver_msp.css',
+        './src/tabs/logging.css',
+        './src/tabs/landing.css',
+        './src/tabs/setup_osd.css',
+        './src/tabs/help.css',
+        './src/tabs/failsafe.css',
+        './src/tabs/ports.css',
+        './src/tabs/setup.css',
+        './src/css/opensans_webfontkit/fonts.css',
+        './src/css/dropdown-lists/css/style_lists.css',
+        './src/css/font-awesome/css/font-awesome.min.css',
+        './src/js/libraries/flightindicators.css',
+        './src/js/libraries/jbox/jBox.css',
+        './src/js/libraries/jbox/themes/NoticeBorder.css',
+        './src/js/libraries/jbox/themes/ModalBorder.css',
+        './src/js/libraries/jbox/themes/TooltipDark.css',
+        './src/js/libraries/jbox/themes/TooltipBorder.css',
+        './src/js/libraries/jquery.nouislider.pips.min.css',
+        './src/js/libraries/switchery/switchery.css',
+        './src/js/libraries/jquery.nouislider.min.css',
 
         // JavaScript
-        './js/libraries/q.js',
-        './js/libraries/jquery-2.1.4.min.js',
-        './js/libraries/jquery-ui-1.11.4.min.js',
-        './js/libraries/d3.min.js',
-        './js/libraries/jquery.nouislider.all.min.js',
-        './js/libraries/three/three.min.js',
-        './js/libraries/three/Projector.js',
-        './js/libraries/three/CanvasRenderer.js',
-        './js/libraries/jquery.flightindicators.js',
-        './js/libraries/semver.js',
-        './js/libraries/jbox/jBox.min.js',
-        './js/libraries/switchery/switchery.js',
-        './js/libraries/bluebird.min.js',
-        './js/libraries/jquery.ba-throttle-debounce.min.js',
-        './js/libraries/inflection.min.js',
-        './js/injected_methods.js',
-        './js/data_storage.js',
-        './js/workers/hex_parser.js',
-        './js/fc.js',
-        './js/port_handler.js',
-        './js/port_usage.js',
-        './js/serial.js',
-        './js/gui.js',
-        './js/huffman.js',
-        './js/default_huffman_tree.js',
-        './js/model.js',
-        './js/serial_backend.js',
-        './js/msp/MSPCodes.js',
-        './js/msp.js',
-        './js/msp/MSPHelper.js',
-        './js/backup_restore.js',
-        './js/peripherals.js',
-        './js/protocols/stm32.js',
-        './js/protocols/stm32usbdfu.js',
-        './js/localization.js',
-        './js/boards.js',
-        './js/RateCurve.js',
-        './js/Features.js',
-        './js/Beepers.js',
-        './js/release_checker.js',
-        './tabs/adjustments.js',
-        './tabs/auxiliary.js',
-        './tabs/cli.js',
-        './tabs/configuration.js',
-        './tabs/failsafe.js',
-        './tabs/firmware_flasher.js',
-        './tabs/gps.js',
-        './tabs/help.js',
-        './tabs/landing.js',
-        './tabs/led_strip.js',
-        './tabs/logging.js',
-        './tabs/map.js',
-        './tabs/motors.js',
-        './tabs/onboard_logging.js',
-        './tabs/osd.js',
-        './tabs/pid_tuning.js',
-        './tabs/ports.js',
-        './tabs/power.js',
-        './tabs/receiver.js',
-        './tabs/receiver_msp.js',
-        './tabs/sensors.js',
-        './tabs/servos.js',
-        './tabs/setup.js',
-        './tabs/setup_osd.js',
-        './tabs/transponder.js',
-        './main.js',
+        './src/js/libraries/q.js',
+        './src/js/libraries/jquery-2.1.4.min.js',
+        './src/js/libraries/jquery-ui-1.11.4.min.js',
+        './src/js/libraries/d3.min.js',
+        './src/js/libraries/jquery.nouislider.all.min.js',
+        './src/js/libraries/three/three.min.js',
+        './src/js/libraries/three/Projector.js',
+        './src/js/libraries/three/CanvasRenderer.js',
+        './src/js/libraries/jquery.flightindicators.js',
+        './src/js/libraries/semver.js',
+        './src/js/libraries/jbox/jBox.min.js',
+        './src/js/libraries/switchery/switchery.js',
+        './src/js/libraries/bluebird.min.js',
+        './src/js/libraries/jquery.ba-throttle-debounce.min.js',
+        './src/js/libraries/inflection.min.js',
+        './src/js/injected_methods.js',
+        './src/js/data_storage.js',
+        './src/js/workers/hex_parser.js',
+        './src/js/fc.js',
+        './src/js/port_handler.js',
+        './src/js/port_usage.js',
+        './src/js/serial.js',
+        './src/js/gui.js',
+        './src/js/huffman.js',
+        './src/js/default_huffman_tree.js',
+        './src/js/model.js',
+        './src/js/serial_backend.js',
+        './src/js/msp/MSPCodes.js',
+        './src/js/msp.js',
+        './src/js/msp/MSPHelper.js',
+        './src/js/backup_restore.js',
+        './src/js/peripherals.js',
+        './src/js/protocols/stm32.js',
+        './src/js/protocols/stm32usbdfu.js',
+        './src/js/localization.js',
+        './src/js/boards.js',
+        './src/js/RateCurve.js',
+        './src/js/Features.js',
+        './src/js/Beepers.js',
+        './src/js/release_checker.js',
+        './src/tabs/adjustments.js',
+        './src/tabs/auxiliary.js',
+        './src/tabs/cli.js',
+        './src/tabs/configuration.js',
+        './src/tabs/failsafe.js',
+        './src/tabs/firmware_flasher.js',
+        './src/tabs/gps.js',
+        './src/tabs/help.js',
+        './src/tabs/landing.js',
+        './src/tabs/led_strip.js',
+        './src/tabs/logging.js',
+        './src/tabs/map.js',
+        './src/tabs/motors.js',
+        './src/tabs/onboard_logging.js',
+        './src/tabs/osd.js',
+        './src/tabs/pid_tuning.js',
+        './src/tabs/ports.js',
+        './src/tabs/power.js',
+        './src/tabs/receiver.js',
+        './src/tabs/receiver_msp.js',
+        './src/tabs/sensors.js',
+        './src/tabs/servos.js',
+        './src/tabs/setup.js',
+        './src/tabs/setup_osd.js',
+        './src/tabs/transponder.js',
+        './src/main.js',
 
         // everything else
-        './package.json', // For NW.js
-        './manifest.json', // For Chrome app
-        './eventPage.js',
-        './*.html',
-        './tabs/*.html',
-        './images/**/*',
-        './_locales/**/*',
-        './css/font-awesome/fonts/*',
-        './css/opensans_webfontkit/*.{eot,svg,ttf,woff,woff2}',
-        './resources/*.json',
-        './resources/models/*',
-        './resources/osd/*.mcm',
-        './resources/motor_order/*.svg',
+        './src/eventPage.js',
+        './src/*.html',
+        './src/tabs/*.html',
+        './src/images/**/*',
+        './src/_locales/**/*',
+        './src/css/font-awesome/fonts/*',
+        './src/css/opensans_webfontkit/*.{eot,svg,ttf,woff,woff2}',
+        './src/resources/*.json',
+        './src/resources/models/*',
+        './src/resources/osd/*.mcm',
+        './src/resources/motor_order/*.svg',
     ];
-    return gulp.src(distSources, { base: '.' })
+    return gulp.src(distSources, { base: 'src' })
+        .pipe(gulp.src('manifest.json', { passthrougth: true }))
+        .pipe(gulp.src('package.json', { passthrougth: true }))
         .pipe(gulp.dest(DIST_DIR))
         .pipe(install({
             npm: '--production --ignore-scripts'
@@ -523,7 +523,7 @@ function release_osx64() {
                     { 'x': 448, 'y': 342, 'type': 'link', 'path': '/Applications' },
                     { 'x': 192, 'y': 344, 'type': 'file', 'path': pkg.name + '.app', 'name': 'Betaflight Configurator.app' }
                 ],
-                background: path.join(__dirname, 'images/dmg-background.png'),
+                background: path.join(__dirname, 'assets/osx/dmg-background.png'),
                 format: 'UDZO',
                 window: {
                     size: {