summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--xdelta3/Makefile.am2
-rw-r--r--xdelta3/configure.ac2
-rwxr-xr-xxdelta3/run_release.sh16
-rw-r--r--xdelta3/xdelta3-main.h4
-rw-r--r--xdelta3/xdelta3.prj2
5 files changed, 13 insertions, 13 deletions
diff --git a/xdelta3/Makefile.am b/xdelta3/Makefile.am
index a1bb6d9..9bc4577 100644
--- a/xdelta3/Makefile.am
+++ b/xdelta3/Makefile.am
@@ -102,8 +102,6 @@ EXTRA_DIST = \
102 examples/iOS/xdelta3-ios-test/xdelta3-ios-test/main.m \ 102 examples/iOS/xdelta3-ios-test/xdelta3-ios-test/main.m \
103 examples/iOS/xdelta3-ios-test/xdelta3-ios-test/xdelta3-ios-test-Info.plist \ 103 examples/iOS/xdelta3-ios-test/xdelta3-ios-test/xdelta3-ios-test-Info.plist \
104 examples/iOS/xdelta3-ios-test/xdelta3-ios-test/xdelta3-ios-test-Prefix.pch \ 104 examples/iOS/xdelta3-ios-test/xdelta3-ios-test/xdelta3-ios-test-Prefix.pch \
105 Makefile.mingw \
106 Makefile.orig \
107 testing/xdelta3-regtest.py \ 105 testing/xdelta3-regtest.py \
108 testing/xdelta3-test.py \ 106 testing/xdelta3-test.py \
109 xdelta3.1 \ 107 xdelta3.1 \
diff --git a/xdelta3/configure.ac b/xdelta3/configure.ac
index 733daec..70eaee9 100644
--- a/xdelta3/configure.ac
+++ b/xdelta3/configure.ac
@@ -1,4 +1,4 @@
1AC_INIT([Xdelta3], [3.0.9], [josh.macdonald@gmail.com], 1AC_INIT([Xdelta3], [3.0.10], [josh.macdonald@gmail.com],
2 [xdelta3], [http://xdelta.org/]) 2 [xdelta3], [http://xdelta.org/])
3AC_PREREQ([2.68]) 3AC_PREREQ([2.68])
4AC_CONFIG_MACRO_DIR([m4]) 4AC_CONFIG_MACRO_DIR([m4])
diff --git a/xdelta3/run_release.sh b/xdelta3/run_release.sh
index 96cb7a0..54d75d0 100755
--- a/xdelta3/run_release.sh
+++ b/xdelta3/run_release.sh
@@ -64,11 +64,6 @@ function try {
64 return $s 64 return $s
65} 65}
66 66
67try untar-lzma ${BUILDDIR} tar -xvf "${LZMA_FILE}"
68if [ $? -ne 0 ]; then
69 return
70fi
71
72function buildlzma { 67function buildlzma {
73 host=$1 68 host=$1
74 march=$2 69 march=$2
@@ -121,11 +116,11 @@ function buildit {
121# ${BMD} 116# ${BMD}
122.PHONY: regtest-${BMD} 117.PHONY: regtest-${BMD}
123regtest-${BMD}: 118regtest-${BMD}:
124 (cd ${D} && ./xdelta3regtest 1> /tmp/regtest.stdout 2> /tmp/regtest.stderr) 119 (cd ${D} && ./xdelta3regtest 1> \${TMP}/regtest.${BMD}.stdout 2> \${TMP}/regtest.${BMD}.stderr)
125 120
126.PHONY: selftest-${BMD} 121.PHONY: selftest-${BMD}
127selftest-${BMD}: 122selftest-${BMD}:
128 (cd ${D} && ./bin/xdelta3 test 1> /tmp/selftest.stdout 2> /tmp/selftest.stderr) 123 (cd ${D} && ./bin/xdelta3 test 1> \${TMP}/selftest.${BMD}.stdout 2> \${TMP}/selftest.${BMD}.stderr)
129 124
130 125
131EOF 126EOF
@@ -178,6 +173,13 @@ function buildall {
178 fi 173 fi
179} 174}
180 175
176setup
177
178try untar-lzma ${BUILDDIR} tar -xvf "${LZMA_FILE}"
179if [ $? -ne 0 ]; then
180 return
181fi
182
181DATE=`date` 183DATE=`date`
182cat > Makefile.test <<EOF 184cat > Makefile.test <<EOF
183# Auto-generated ${DATE} -*- Mode: Makefile -*- 185# Auto-generated ${DATE} -*- Mode: Makefile -*-
diff --git a/xdelta3/xdelta3-main.h b/xdelta3/xdelta3-main.h
index e3c4e86..db94a60 100644
--- a/xdelta3/xdelta3-main.h
+++ b/xdelta3/xdelta3-main.h
@@ -337,8 +337,8 @@ xprintf (const char *fmt, ...)
337static int 337static int
338main_version (void) 338main_version (void)
339{ 339{
340 /* $Format: " XPR(NTR \"Xdelta version $Xdelta3Version$, Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, Joshua MacDonald\\n\");" $ */ 340 /* $Format: " XPR(NTR \"Xdelta version $Xdelta3Version$, Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, Joshua MacDonald\\n\");" $ */
341 XPR(NTR "Xdelta version 3.0.9, Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Joshua MacDonald\n"); 341 XPR(NTR "Xdelta version 3.0.10, Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Joshua MacDonald\n");
342 XPR(NTR "Xdelta comes with ABSOLUTELY NO WARRANTY.\n"); 342 XPR(NTR "Xdelta comes with ABSOLUTELY NO WARRANTY.\n");
343 XPR(NTR "This is free software, and you are welcome to redistribute it\n"); 343 XPR(NTR "This is free software, and you are welcome to redistribute it\n");
344 XPR(NTR "under certain conditions; see \"COPYING\" for details.\n"); 344 XPR(NTR "under certain conditions; see \"COPYING\" for details.\n");
diff --git a/xdelta3/xdelta3.prj b/xdelta3/xdelta3.prj
index 605e40c..96c3a8c 100644
--- a/xdelta3/xdelta3.prj
+++ b/xdelta3/xdelta3.prj
@@ -9,7 +9,7 @@
9(Checkin-Login jmacd) 9(Checkin-Login jmacd)
10(Populate-Ignore ("\\.svn")) 10(Populate-Ignore ("\\.svn"))
11(Project-Keywords 11(Project-Keywords
12 (Xdelta3Version "3.0.9") 12 (Xdelta3Version "3.0.10")
13 ) 13 )
14(Files 14(Files
15 (COPYING (xdelta3/b/29_COPYING 1.1 744)) 15 (COPYING (xdelta3/b/29_COPYING 1.1 744))