[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] r20382: {torbrowser} This updates the Makefile to properly build everything from (torbrowser/trunk/build-scripts)
Author: ioerror
Date: 2009-08-26 22:56:00 -0400 (Wed, 26 Aug 2009)
New Revision: 20382
Modified:
torbrowser/trunk/build-scripts/Makefile.debian-build
Log:
This updates the Makefile to properly build everything from nothing to binaries. Next up will be a construction of a generic, non-localized browser bundle.
Modified: torbrowser/trunk/build-scripts/Makefile.debian-build
===================================================================
--- torbrowser/trunk/build-scripts/Makefile.debian-build 2009-08-26 22:33:28 UTC (rev 20381)
+++ torbrowser/trunk/build-scripts/Makefile.debian-build 2009-08-27 02:56:00 UTC (rev 20382)
@@ -92,7 +92,7 @@
cd $(OPENSSL_DIR) && make install
QT_DIR=$(FETCH_DIR)/qt-x11-opensource-src-$(QT_VER)/
-QT_BUILD_PREFS=-system-zlib -openssl-linked -no-qt3support -fast -release -nomake demos -nomake example
+QT_BUILD_PREFS=-system-zlib -openssl-linked -no-qt3support -fast -release -nomake demos -nomake examples
QT_OPTS=$(QT_BUILD_PREFS) -prefix $(BUILT_DIR) -I $(BUILT_DIR)/include -I $(BUILT_DIR)/include/openssl/ -L $(BUILT_DIR)/lib/
build-qt:
cd $(QT_DIR) && ./configure $(QT_OPTS)
@@ -121,13 +121,12 @@
cd $(TOR_DIR) && make install
## Polipo doesn't use autoconf, so we just have to hack their Makefile
-# HACKUP THE MAKEFILE TO FIX THE PREFIX!
-## PREFIX = /home/rorreoi/tmp/build/built
-## LOCAL_ROOT = /home/rorreoi/tmp/build/built/usr/share/polipo/www
-## DISK_CACHE_ROOT = /home/rorreoi/tmp/build/built/var/cache/polipo
+## This probably needs to be updated if Polipo ever updates their Makefile
POLIPO_DIR=$(FETCH_DIR)/polipo-$(POLIPO_VER)/
+POLIPO_MAKEFILE=polipo-Makefile
build-polipo:
- cd $(POLIPO_DIR) && make && make install.binary
+ cp $(POLIPO_MAKEFILE) $(POLIPO_DIR)/Makefile
+ cd $(POLIPO_DIR) && make && PREFIX=/tmp/build/built/ make install.binary
build-pidgin:
echo "We're not building pidgin yet!"
@@ -135,11 +134,13 @@
build-firefox:
echo "We're using a prebuilt firefox. Fix this someday!"
-build-all-binaries: source-dance build-zlib build-openssl build-qt build-vidalia build-libevent build-tor
+build-all-binaries: source-dance build-zlib build-openssl build-qt build-vidalia build-libevent build-tor build-polipo build-pidgin build-firefox
echo "If we're here, we've done something right."
## Location of compiled libraries
COMPILED_LIBS=$(BUILT_DIR)/lib/
+## Location of compiled binaries
+COMPILED_BINS=$(BUILT_DIR)/bin/
## Location of the libraries we've built
QT=$(COMPILED_LIBS)
@@ -147,17 +148,18 @@
ZLIB=$(COMPILED_LIBS)
LIBEVENT=$(COMPILED_LIBS)
-## Location of bundle components
-VIDALIA=/c/build/vidalia-0.1.15
-TOR=/c/build/tor-0.2.1.17-rc
-POLIPO=/c/build/polipo-1.0.4
-FIREFOX_SRC=/c/build/FirefoxPortable-3.0.11
-PIDGIN_SRC=/c/build/PidginPortable-2.5.8
+## Location of binary bundle components
+VIDALIA=$(COMPILED_BINS)/vidalia
+TOR=$(COMPILED_BINS)/tor
+POLIPO=$(COMPILED_BINS)/polipo
+## Someday, this will be our custom Firefox
+FIREFOX=$(FETCH_DIR)/firefox
+PIDGIN=$(COMPILED_BINS)/pidgin
## Location of utility applications
-SEVENZIP="/c/Program Files/7-Zip/7z.exe"
+#SEVENZIP="/c/Program Files/7-Zip/7z.exe"
WGET:=$(shell which wget)
-WINRAR="/c/Program Files/WinRAR/WinRAR.exe"
+#WINRAR="/c/Program Files/WinRAR/WinRAR.exe"
## Size of split archive volumes for WinRAR
SPLITSIZE=1440k
@@ -249,6 +251,7 @@
##
clean:
+ rm -fr $(FETCH_DIR)
rm -fr $(DEST) *.stamp
rm -f *~
rm -fr *.xpi *.jar
@@ -275,17 +278,21 @@
touch generic-bundle.stamp
APPDIR=$(DEST)/App
+LIBSDIR=$(DEST)/Lib
DOCSDIR=$(DEST)/Docs
DATADIR=$(DEST)/Data
+TMPDIR=$(DEST)/tmp
## Build directory structure
directory-structure:
rm -fr $(DEST)
mkdir -p $(APPDIR)
+ mkdir -p $(LIBSDIR)
mkdir -p $(DATADIR)/Tor
mkdir -p $(DATADIR)/Vidalia
mkdir -p $(DATADIR)/Polipo
mkdir -p $(DOCSDIR)
+ mkdir -p $(TMPDIR)
## Package up all the Vidalia and Tor pre-requisites
## Filenames extracted using Dependency Walker <http://www.dependencywalker.com/>