projects
/
OSXPackageBuilder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clarify when to use the -pcre option when constructing the distribution package content
[OSXPackageBuilder.git]
/
build.sh
diff --git
a/build.sh
b/build.sh
index
65dd23b
..
dd2d58c
100755
(executable)
--- a/
build.sh
+++ b/
build.sh
@@
-28,14
+28,15
@@
# USA
#
# Modification : If you modify this file please consider whether your
# USA
#
# Modification : If you modify this file please consider whether your
-# changes ought to be passed back to the macsetup module.
+# changes ought to be passed back to the OSXPackageBuilder
+# module.
#
#
# must provide target
#
#
#
# must provide target
#
-if [ $# -eq 0 -o $# -gt
1
]; then
- echo "Usage: $0 lion | snowleopard64 | snowleopard | leopardupwards | leopard | tiger | panther"
+if [ $# -eq 0 -o $# -gt
2
]; then
+ echo "Usage: $0 lion | snowleopard64 | snowleopard | leopardupwards | leopard | tiger | panther
[-pcre]
"
exit 1
fi
exit 1
fi
@@
-48,14
+49,20
@@
fi
# must have Xcode
#
if [ -z ${XCODE_PATH} ]; then
# must have Xcode
#
if [ -z ${XCODE_PATH} ]; then
- echo "Error:
this release of Mac OS X not supporte
d."
+ echo "Error:
Xcode is not foun
d."
exit 1
fi
#
exit 1
fi
#
-#
use default options
+#
set configure options; include the appropriate user/group as discerned by common.sh and set pcre to dynamic (libpcre) or static (bundled)
#
#
-OPTS=${OPTS}
+if [ "$2" == "-pcre" ]; then
+ CFLAGS="${CFLAGS} -I/usr/local/include/"
+ LDFLAGS="${LDFLAGS} -L/usr/local/lib"
+ OPTS=${OPTS}
+else
+ OPTS="${OPTS} --disable-dynamic-pcre"
+fi
#
# check if privoxy group and user exist?
#
# check if privoxy group and user exist?
@@
-76,9
+83,10
@@
fi
#
echo ""
echo "Notice: configuring the privoxy software."
#
echo ""
echo "Notice: configuring the privoxy software."
-cd ../
current
+cd ../
${SOURCE_DIR}
/usr/bin/autoheader
/usr/bin/autoconf
/usr/bin/autoheader
/usr/bin/autoconf
+
/usr/bin/env CFLAGS="${CFLAGS} ${SYSROOT} ${ARCH} ${MACOSX_VERSION}" LDFLAGS="${LDFLAGS} ${SYSROOT} ${ARCH} ${MACOSX_VERSION}" ./configure ${OPTS}
#
/usr/bin/env CFLAGS="${CFLAGS} ${SYSROOT} ${ARCH} ${MACOSX_VERSION}" LDFLAGS="${LDFLAGS} ${SYSROOT} ${ARCH} ${MACOSX_VERSION}" ./configure ${OPTS}
#
@@
-92,6
+100,6
@@
echo "Notice: building the privoxy software."
#
# modify config file
#
#
# modify config file
#
-/usr/bin/awk '{sub(/logfile.*logfile$/,"logfile logfile.log"); print}' ../
current/config > ../current
/config.tmp
-/bin/mv ../
current/config.tmp ../current
/config
+/usr/bin/awk '{sub(/logfile.*logfile$/,"logfile logfile.log"); print}' ../
${SOURCE_DIR}/config > ../${SOURCE_DIR}
/config.tmp
+/bin/mv ../
${SOURCE_DIR}/config.tmp ../${SOURCE_DIR}
/config