[debian-edu-commits] debian-edu/ 06/08: build guacamole-common-js with tools already in Debian

[Dominik George]

This is an automated email from the git hooks/post-receive script.

natureshadow-guest pushed a commit to branch master
in repository guacamole-client.

commit f8d094cc9bd25cc6ff149dd0ebb0a8f61e3a1db1
Author: mirabilos <thorsten.glaser at teckids.org>
Date:   Fri Oct 14 22:48:40 2016 +0200

    build guacamole-common-js with tools already in Debian
    
    Signed-off-by: mirabilos <thorsten.glaser at teckids.org>
---
 debian/control                                   |   1 +
 debian/patches/series                            |   1 +
 debian/patches/uglify-with-tools-in-debian.patch | 113 +++++++++++++++++++++++
 3 files changed, 115 insertions(+)

diff --git a/debian/control b/debian/control
index 8859534..6afe712 100644
--- a/debian/control
+++ b/debian/control
@@ -25,6 +25,7 @@ Build-Depends:
  libslf4j-java,
  libtomcat8-java,
  maven-debian-helper,
+ node-uglify (>= 2.4.15),
  po-debconf,
 Standards-Version: 3.9.8
 Section: net
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4c95acc
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+uglify-with-tools-in-debian.patch
diff --git a/debian/patches/uglify-with-tools-in-debian.patch b/debian/patches/uglify-with-tools-in-debian.patch
new file mode 100644
index 0000000..0144adf
--- /dev/null
+++ b/debian/patches/uglify-with-tools-in-debian.patch
@@ -0,0 +1,113 @@
+From: mirabilos <thorsten.glaser at teckids.org>
+Subject: use tools we already have in Debian to build this
+
+--- /dev/null
++++ b/guacamole-common-js/build.sh
+@@ -0,0 +1,36 @@
++#!/bin/bash
++#-
++# Copyright © 2016
++#	mirabilos <thorsten.glaser at teckids.org>
++#
++# Provided that these terms and disclaimer and all copyright notices
++# are retained or reproduced in an accompanying document, permission
++# is granted to deal in this work without restriction, including un‐
++# limited rights to use, publicly perform, distribute, sell, modify,
++# merge, give away, or sublicence.
++#
++# This work is provided “AS IS” and WITHOUT WARRANTY of any kind, to
++# the utmost extent permitted by applicable law, neither express nor
++# implied; without malicious intent or gross negligence. In no event
++# may a licensor, author or contributor be held liable for indirect,
++# direct, other damage, loss, or other issues arising in any way out
++# of dealing in the work, even if advised of the possibility of such
++# damage or existence of a defect, except proven that it results out
++# of said person’s immediate fault when using the work as intended.
++#-
++# Compile this with tools that are actually in Debian
++
++# initialisation
++LC_ALL=C; export LC_ALL
++unset LANGUAGE
++
++set -e
++cd "$(dirname "$0")"
++shopt -s globstar
++set -x
++
++rm -rf target/built
++mkdir -p target/built
++cat src/main/webapp/common/license.js src/main/webapp/modules/**/*.js >target/built/all.js
++uglifyjs --preamble "$(cat src/main/webapp/common/license.js)" \
++    src/main/webapp/modules/**/*.js --mangle --compress >target/built/all.min.js
+--- a/guacamole-common-js/pom.xml
++++ b/guacamole-common-js/pom.xml
+@@ -73,37 +73,26 @@
+             </plugin>
+ 
+             <!-- JS/CSS Minification Plugin -->
+-            <plugin>
+-                <groupId>com.samaxes.maven</groupId>
+-                <artifactId>minify-maven-plugin</artifactId>
+-                <version>1.6.1</version>
+-                <executions>
+-                    <execution>
+-                        <id>default-minify</id>
+-                        <configuration>
+-
+-                            <charset>UTF-8</charset>
+-                            <jsEngine>CLOSURE</jsEngine>
+-
+-                            <jsSourceDir>/</jsSourceDir>
+-                            <jsTargetDir>/</jsTargetDir>
+-                            <jsFinalFile>all.js</jsFinalFile>
+-
+-                            <jsSourceFiles>
+-                                <jsSourceFile>common/license.js</jsSourceFile> 
+-                            </jsSourceFiles>
+-
+-                            <jsSourceIncludes>
+-                                <jsSourceInclude>modules/**/*.js</jsSourceInclude>
+-                            </jsSourceIncludes>
+-
+-                        </configuration>
+-                        <goals>
+-                            <goal>minify</goal>
+-                        </goals>
+-                    </execution>
+-                </executions>
+-            </plugin>
++		<plugin>
++			<groupId>org.codehaus.mojo</groupId>
++			<artifactId>exec-maven-plugin</artifactId>
++			<version>1.1.1</version>
++			<executions>
++				<execution>
++					<id>do-build</id>
++					<phase>compile</phase>
++					<goals>
++						<goal>exec</goal>
++					</goals>
++					<configuration>
++						<executable>/bin/bash</executable>
++						<arguments>
++							<argument>build.sh</argument>
++						</arguments>
++					</configuration>
++				</execution>
++			</executions>
++		</plugin>
+ 
+         </plugins>
+     </build>
+--- a/guacamole-common-js/static.xml
++++ b/guacamole-common-js/static.xml
+@@ -13,7 +13,7 @@
+             <outputDirectory>modules/</outputDirectory>
+         </fileSet>
+         <fileSet>
+-            <directory>target/${project.name}-${project.version}/</directory>
++            <directory>target/built/</directory>
+             <includes>
+                 <include>*.js</include>
+             </includes>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/guacamole-client.git