[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] First cut of code to make mac osx packages. Once this is m...
- To: or-cvs@xxxxxxxxxxxxx
- Subject: [or-cvs] First cut of code to make mac osx packages. Once this is m...
- From: nickm@xxxxxxxx (Nick Mathewson)
- Date: Sat, 18 Dec 2004 23:26:32 -0500 (EST)
- Delivered-to: archiver@seul.org
- Delivered-to: or-cvs-outgoing@seul.org
- Delivered-to: or-cvs@seul.org
- Delivery-date: Sat, 18 Dec 2004 23:31:33 -0500
- Reply-to: or-dev@xxxxxxxxxxxxx
- Sender: owner-or-cvs@xxxxxxxxxxxxx
Update of /home/or/cvsroot/tor
In directory moria.mit.edu:/tmp/cvs-serv4872
Modified Files:
Tag: tor-0_0_9-patches
Makefile.am configure.in
Log Message:
First cut of code to make mac osx packages. Once this is more confirmed, port it to mainline CVS.
Index: Makefile.am
===================================================================
RCS file: /home/or/cvsroot/tor/Makefile.am,v
retrieving revision 1.15.2.1
retrieving revision 1.15.2.2
diff -u -d -r1.15.2.1 -r1.15.2.2
--- Makefile.am 18 Dec 2004 23:01:49 -0000 1.15.2.1
+++ Makefile.am 19 Dec 2004 04:26:28 -0000 1.15.2.2
@@ -24,6 +24,10 @@
mv $$RPM_BUILD_DIR/RPMS/*/* .; \
rm -rf $$RPM_BUILD_DIR
+dist-osx:
+ $(MAKE) all
+ VERSION=$(VERSION) sh ./contrib/osx/package.sh
+
doxygen:
doxygen && cd doc/doxygen/latex && make
Index: configure.in
===================================================================
RCS file: /home/or/cvsroot/tor/configure.in,v
retrieving revision 1.156
retrieving revision 1.156.2.1
diff -u -d -r1.156 -r1.156.2.1
--- configure.in 15 Dec 2004 19:51:33 -0000 1.156
+++ configure.in 19 Dec 2004 04:26:29 -0000 1.156.2.1
@@ -244,7 +244,7 @@
echo "confdir: $CONFDIR"
-AC_OUTPUT(Makefile tor.spec contrib/tor.sh contrib/torctl contrib/torify contrib/Makefile src/config/torrc.sample doc/tor.1 src/Makefile doc/Makefile doc/design-paper/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/win32/Makefile src/tools/Makefile)
+AC_OUTPUT(Makefile tor.spec contrib/tor.sh contrib/torctl contrib/torify contrib/Makefile contrib/osx/Makefile contrib/osx/TorBundleDesc.plist contrib/osx/TorBundleInfo.plist contrib/osx/TorDesc.plist contrib/osx/TorInfo.plist src/config/torrc.sample doc/tor.1 src/Makefile doc/Makefile doc/design-paper/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/win32/Makefile src/tools/Makefile)
if test -x /usr/bin/perl && test -x ./contrib/updateVersions.pl ; then
./contrib/updateVersions.pl