freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [4/4] incubator-freemarker-docgen git commit: We can't have the non-minified Gulp-concatenated files in the output, unless the license header issues will be fixed.
Date Sat, 02 Jan 2016 01:11:19 GMT
We can't have the non-minified Gulp-concatenated files in the output, unless the license header
issues will be fixed.


Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/commit/a18b4f1a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/tree/a18b4f1a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/diff/a18b4f1a

Branch: refs/heads/master
Commit: a18b4f1a65a4cd6102b9853bdf904ce008ae3816
Parents: 115ca1e
Author: ddekany <ddekany@apache.org>
Authored: Sat Jan 2 02:11:04 2016 +0100
Committer: ddekany <ddekany@apache.org>
Committed: Sat Jan 2 02:11:04 2016 +0100

----------------------------------------------------------------------
 gulpfile.js                                   | 5 ++++-
 src/main/org/freemarker/docgen/Transform.java | 2 --
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/a18b4f1a/gulpfile.js
----------------------------------------------------------------------
diff --git a/gulpfile.js b/gulpfile.js
index 0c108de..bf51a8b 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -16,7 +16,10 @@ var BASE_DIR = path.join(__dirname, 'src', 'main', 'org', 'freemarker',
'docgen'
 var OUT_DIR = path.join(BASE_DIR, 'statics');
 
 var copyrightHeader = fs.readFileSync(path.join(__dirname, 'gulp-output-copyright-header.txt'));
-var doNotEditHeader = "/* GENERATED WITH GULP - DO NOT EDIT! */\n\n"
+var doNotEditHeader = "/*\n"
+        + " * GENERATED WITH GULP - DO NOT EDIT!\n"
+        + " * Any copyright headers below are coming from the source files from which this
file was generated.\n"
+        + " */\n\n"
 
 gulp.task('styles', function() {
   gulp.src(path.join(BASE_DIR, 'less', 'styles.less'))

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/a18b4f1a/src/main/org/freemarker/docgen/Transform.java
----------------------------------------------------------------------
diff --git a/src/main/org/freemarker/docgen/Transform.java b/src/main/org/freemarker/docgen/Transform.java
index 7fcdb9f..5dc1d6f 100644
--- a/src/main/org/freemarker/docgen/Transform.java
+++ b/src/main/org/freemarker/docgen/Transform.java
@@ -1499,7 +1499,6 @@ public final class Transform {
 
         // - Copy the standard statics:
         logger.info("Copying common static files...");
-        copyCommonStatic("docgen.css");
         copyCommonStatic("docgen.min.css");
         copyCommonStatic("img/patterned-bg.png");
 
@@ -1517,7 +1516,6 @@ public final class Transform {
             copyCommonStatic("img/xxe.png");
         }
         if (!disableJavaScript) {
-          copyCommonStatic("main.js");
           copyCommonStatic("main.min.js");
         }
 


Mime
View raw message