[Pkg-javascript-commits] [jquery] 12/15: also test (and fix) the build for jquery-compat

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository jquery.

commit e0e6ae64c7287bb703bd482b165252bf9e1620d8
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Wed Sep 2 10:57:56 2015 -0300

    also test (and fix) the build for jquery-compat
---
 debian/build.js                           |  8 +++----
 debian/release-check                      |  4 ++--
 debian/tests/check-against-upstream-build | 35 ++++++++++++++++++++++++-------
 3 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/debian/build.js b/debian/build.js
index 517371b..de1cade 100644
--- a/debian/build.js
+++ b/debian/build.js
@@ -1,9 +1,9 @@
 /* This file is based on build/tasks/build.js
  */
 ({
-  baseUrl: process.env['INPUT'] || "src",
+  baseUrl: process.env['INPUT'],
   name: "jquery",
-  out: process.env['OUTPUT'] || "dist/jquery.js",
+  out: process.env['OUTPUT'],
   // We have multiple minify steps
   optimize: "none",
   // Include dependencies loaded with require
@@ -11,8 +11,8 @@
   // Avoid breaking semicolons inserted by r.js
   skipSemiColonInsertion: true,
   wrap: {
-    startFile: "src/intro.js",
-    endFile: [ "src/exports/global.js", "src/outro.js" ]
+    startFile: (process.env['INPUT']) + "/intro.js",
+    endFile: [ (process.env['INPUT']) + "/exports/global.js", (process.env['INPUT']) + "/outro.js" ]
   },
   paths: {
     sizzle: "../external/sizzle/dist/sizzle"
diff --git a/debian/release-check b/debian/release-check
index 7908ef2..a93bffd 100755
--- a/debian/release-check
+++ b/debian/release-check
@@ -2,8 +2,8 @@
 
 set -e
 
-./debian/rules dist/jquery.js
+./debian/rules dist/jquery.js dist-compat/jquery.js
 rc=0
-./debian/tests/check-against-upstream-build dist/jquery.js || rc=$?
+./debian/tests/check-against-upstream-build dist/jquery.js dist-compat/jquery.js || rc=$?
 ./debian/rules clean
 exit $rc
diff --git a/debian/tests/check-against-upstream-build b/debian/tests/check-against-upstream-build
index 4c2ba86..8549571 100755
--- a/debian/tests/check-against-upstream-build
+++ b/debian/tests/check-against-upstream-build
@@ -6,9 +6,14 @@ set -ex
 
 version=$(dpkg-parsechangelog -SVersion | cut -d + -f 1 | sed 's/~/-/')
 
-our_build="$1"
-if [ -z "$our_build" ]; then
-  our_build='/usr/share/javascript/jquery/jquery.js'
+main_build="$1"
+if [ -z "$main_build" ]; then
+  main_build='/usr/share/javascript/jquery/jquery.js'
+fi
+
+compat_build="$2"
+if [ -z "$compat_build" ]; then
+  compat_build='/usr/share/javascript/jquery-compat/jquery.js'
 fi
 
 upstream_cache="$ADTTMP"
@@ -16,13 +21,29 @@ if [ -z "$upstream_cache" ]; then
   upstream_cache=$HOME/.cache/jquery-debian
   mkdir -p "$upstream_cache"
 fi
-upstream_build=$upstream_cache/jquery-${version}.js
+upstream_main_build=$upstream_cache/jquery-${version}.js
+upstream_compat_build=$upstream_cache/jquery-compat-${version}.js
 
-if [ ! -f "$upstream_build" ]; then
-  wget --output-document="$upstream_build" \
+if [ ! -f "$upstream_main_build" ]; then
+  wget --output-document="$upstream_main_build" \
     http://code.jquery.com/jquery-${version}.js
 fi
 
+if [ ! -f "$upstream_compat_build" ]; then
+  wget --output-document="$upstream_compat_build" \
+    http://code.jquery.com/jquery-compat-${version}.js
+fi
+
+# main branch
+main_rc=0
 diff --ignore-blank-lines \
   --ignore-matching-lines=Date:.*Z \
-  -u "$upstream_build" "$our_build"
+  -u "$upstream_main_build" "$main_build" || main_rc=$?
+
+# compat branch
+compat_rc=0
+diff --ignore-blank-lines \
+  --ignore-matching-lines=Date:.*Z \
+  -u "$upstream_compat_build" "$compat_build" || compat_rc=$?
+
+test "$main_rc" -eq 0 -a "$compat_rc" -eq 0

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/jquery.git