From f02566cf2aea46b86a57ac0bfb374d70e40bddab Mon Sep 17 00:00:00 2001
From: Benoit Lavenier <benoit.lavenier@e-is.pro>
Date: Thu, 26 Dec 2019 16:33:55 +0100
Subject: [PATCH] [fix] Fix Android and iOS compilation (keep fonts)
---
.../050_clean_unused_directories.js | 40 ++++++-------------
.../061_prepare_ubuntu_config.js | 38 ------------------
2 files changed, 13 insertions(+), 65 deletions(-)
delete mode 100755 hooks/after_prepare/061_prepare_ubuntu_config.js
diff --git a/hooks/after_prepare/050_clean_unused_directories.js b/hooks/after_prepare/050_clean_unused_directories.js
index 1de9fa09..269449b1 100755
--- a/hooks/after_prepare/050_clean_unused_directories.js
+++ b/hooks/after_prepare/050_clean_unused_directories.js
@@ -1,14 +1,11 @@
#!/usr/bin/env node
"use strict";
var gulp = require('gulp');
-var gutil = require('gulp-util');
-var allConfig = require('../../app/config.json');
var path = require("path");
var del = require('del');
var cmd = process.env.CORDOVA_CMDLINE;
var rootdir = process.argv[2];
-var argv = require('yargs').argv;
var skip = true;
if (cmd.indexOf("--release") > -1 || cmd.indexOf("--useref") > -1) {
@@ -25,7 +22,7 @@ if (rootdir && !skip) {
var platform = platforms[x].trim().toLowerCase();
var wwwPath;
- if(platform == 'android') {
+ if(platform === 'android') {
wwwPath = path.join(rootdir, 'platforms', platform, 'assets', 'www');
} else {
wwwPath = path.join(rootdir, 'platforms', platform, 'www');
@@ -35,41 +32,30 @@ if (rootdir && !skip) {
//console.log('['+process.mainModule.filename+'] Cleaning unused directories');
// Clean unused directories
- del([
+ del.sync([
path.join(wwwPath, 'i18n'),
path.join(wwwPath, 'js'),
path.join(wwwPath, 'templates'),
path.join(wwwPath, 'css'),
path.join(wwwPath, 'dist'),
- path.join(wwwPath, 'js'),
path.join(wwwPath, 'cordova-js-src'),
path.join(wwwPath, 'plugins', 'es'),
path.join(wwwPath, 'plugins', 'graph'),
path.join(wwwPath, 'plugins', 'map'),
path.join(wwwPath, 'plugins', 'rml9'),
- path.join(wwwPath, 'lib', '**'),
- // Keep Ionic lib/ionic/fonts directory
- '!'+path.join(wwwPath, 'lib'),
+
+ // Clean lib directory...
+ path.join(wwwPath, 'lib', '*'),
+
+ // ...but keep Ionic fonts directory
'!'+path.join(wwwPath, 'lib', 'ionic'),
+ path.join(wwwPath, 'lib', 'ionic', '*'),
'!'+path.join(wwwPath, 'lib', 'ionic', 'fonts'),
- '!'+path.join(wwwPath, 'lib', 'ionic', 'fonts', '**'),
- '!'+path.join(wwwPath, 'lib', 'ionic', 'fonts', 'robotdraft'),
- '!'+path.join(wwwPath, 'lib', 'ionic', 'fonts', 'robotdraft', 'Black'),
- '!'+path.join(wwwPath, 'lib', 'ionic', 'fonts', 'robotdraft', 'Black', '**'),
- '!'+path.join(wwwPath, 'lib', 'ionic', 'fonts', 'robotdraft', 'Bold'),
- '!'+path.join(wwwPath, 'lib', 'ionic', 'fonts', 'robotdraft', 'Bold', '**'),
- '!'+path.join(wwwPath, 'lib', 'ionic', 'fonts', 'robotdraft', 'BoldItalic'),
- '!'+path.join(wwwPath, 'lib', 'ionic', 'fonts', 'robotdraft', 'BoldItalic', '**'),
- '!'+path.join(wwwPath, 'lib', 'ionic', 'fonts', 'robotdraft', 'Italic'),
- '!'+path.join(wwwPath, 'lib', 'ionic', 'fonts', 'robotdraft', 'Italic', '**'),
- '!'+path.join(wwwPath, 'lib', 'ionic', 'fonts', 'robotdraft', 'Light'),
- '!'+path.join(wwwPath, 'lib', 'ionic', 'fonts', 'robotdraft', 'Light', '**'),
- '!'+path.join(wwwPath, 'lib', 'ionic', 'fonts', 'robotdraft', 'Medium'),
- '!'+path.join(wwwPath, 'lib', 'ionic', 'fonts', 'robotdraft', 'Medium', '**'),
- '!'+path.join(wwwPath, 'lib', 'ionic', 'fonts', 'robotdraft', 'Regular'),
- '!'+path.join(wwwPath, 'lib', 'ionic', 'fonts', 'robotdraft', 'Regular', '**'),
- '!'+path.join(wwwPath, 'lib', 'ionic', 'fonts', 'robotdraft', 'Thin'),
- '!'+path.join(wwwPath, 'lib', 'ionic', 'fonts', 'robotdraft', 'Thin', '**')
+
+ // ...and keep Robotodraft fonts directory
+ '!'+path.join(wwwPath, 'lib', 'robotdraft'),
+ path.join(wwwPath, 'lib', 'robotdraft', '*'),
+ '!'+path.join(wwwPath, 'lib', 'robotdraft', 'fonts'),
]);
}
}
diff --git a/hooks/after_prepare/061_prepare_ubuntu_config.js b/hooks/after_prepare/061_prepare_ubuntu_config.js
deleted file mode 100755
index bfd329d9..00000000
--- a/hooks/after_prepare/061_prepare_ubuntu_config.js
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env node
-"use strict";
-var gulp = require('gulp');
-var path = require("path");
-var replace = require('gulp-replace');
-
-var rootdir = process.argv[2];
-
-if (rootdir) {
-
- // go through each of the platform directories that have been prepared
- var platforms = (process.env.CORDOVA_PLATFORMS ? process.env.CORDOVA_PLATFORMS.split(',') : []);
-
- for(var x=0; x<platforms.length; x++) {
-
- var platform = platforms[x].trim().toLowerCase();
-
- if(platform == 'ubuntu') {
- var platformPath = path.join(rootdir, 'platforms', platform);
- var ionicConfigFile = path.join(platformPath, 'config.xml');
-
- // Clean unused directories
- console.log('-----------------------------------------');
- console.log(' Updating file: ' + ionicConfigFile);
- gulp.src(ionicConfigFile)
-
- // change App ID into 'duniter-cesium'
- .pipe(replace(/id="fr.duniter.cesium"/g, 'id="cesium"'))
-
- .pipe(gulp.dest(platformPath));
-
- console.log('-----------------------------------------');
- }
-
-
- }
-}
-
--
GitLab