[tor-commits] [torbrowser/master] update alpha makefiles to build stable vidalia instead of alpha

[erinn at torproject.org]

commit c3bde0a4aecedda9253c2bc463a3cb1bc1cb433c
Author: Erinn Clark <erinn at torproject.org>
Date:   Wed Jul 25 17:23:32 2012 +0100

    update alpha makefiles to build stable vidalia instead of alpha
---
 build-scripts/linux-alpha.mk   |   11 +++++------
 build-scripts/osx-alpha.mk     |    8 +++-----
 build-scripts/windows-alpha.mk |    2 +-
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk
index d78c977..0eacd15 100644
--- a/build-scripts/linux-alpha.mk
+++ b/build-scripts/linux-alpha.mk
@@ -87,13 +87,12 @@ build-qtfoo:
 	cd $(QTSCRIPT_DIR)/qtbindings && for i in $(ls -d qtscript_*); do make -C $i release; done
 
 
-VIDALIA_DIR=$(FETCH_DIR)/vidalia-$(VIDALIA_VER)
-VIDALIA_OPTS=-DOPENSSL_LIBCRYPTO=$(BUILT_DIR)/lib/libcrypto.so.1.0.0 -DOPENSSL_LIBSSL=$(BUILT_DIR)/lib/libssl.so.1.0.0 -DQT_QMAKE_EXECUTABLE=$(BUILT_DIR)/bin/qmake -DSCRIPT_DIR=$(QTSCRIPT_DIR)/plugins/script -DTOR_SOURCE_DIR=$(TOR_DIR) ..
-build-vidalia:
-	-rm -rf $(VIDALIA_DIR)/build
+VIDALIA_OPTS=-DCMAKE_BUILD_TYPE=debug -DQT_QMAKE_EXECUTABLE=$(BUILT_DIR)/bin/qmake ..
+build-vidalia: build-qt $(VIDALIA_DIR)
 	-mkdir $(VIDALIA_DIR)/build
-	cd $(VIDALIA_DIR)/build && cmake $(VIDALIA_OPTS) && make
-#	cd $(VIDALIA_DIR)/build && DESTDIR=$(BUILT_DIR) make install
+	cd $(VIDALIA_DIR)/build && cmake $(VIDALIA_OPTS) && make -j $(NUM_CORES)
+	cd $(VIDALIA_DIR)/build && DESTDIR=$(BUILT_DIR) make install
+	touch $(STAMP_DIR)/build-vidalia
 
 LIBEVENT_DIR=$(FETCH_DIR)/libevent-$(LIBEVENT_VER)
 LIBEVENT_OPTS=--prefix=$(BUILT_DIR)
diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk
index fc6479b..6d5c53b 100644
--- a/build-scripts/osx-alpha.mk
+++ b/build-scripts/osx-alpha.mk
@@ -93,15 +93,13 @@ build-qtscript3:
 build-qtfoo:
 	cd $(QTSCRIPT_DIR)/qtbindings && for i in $(ls -d qtscript_*); do make -C $i release; done
 
-
-
 VIDALIA_OPTS=-DCMAKE_OSX_ARCHITECTURES=$(ARCH_TYPE) -DQT_QMAKE_EXECUTABLE=$(BUILT_DIR)/bin/qmake \
-	-DSCRIPT_DIR=$(QTSCRIPT_DIR)/plugins/script -DTOR_SOURCE_DIR=$(TOR_DIR) ..
-build-vidalia: build-openssl build-qt $(VIDALIA_DIR)
+	-DCMAKE_BUILD_TYPE=debug ..
+build-vidalia: build-qt $(VIDALIA_DIR)
 	-mkdir $(VIDALIA_DIR)/build
 	cd $(VIDALIA_DIR)/build && \
 	MACOSX_DEPLOYMENT_TARGET=$(OSX_VERSION) cmake $(VIDALIA_OPTS) \
-	&& make -j $(NUM_CORES) && make dist-osx
+	&& make -j $(NUM_CORES) && make dist-osx-libraries
 	cd $(VIDALIA_DIR)/build && DESTDIR=$(BUILT_DIR) make install
 	cp -r $(QT_DIR)/src/gui/mac/qt_menu.nib $(VIDALIA)/Contents/Resources/
 	touch $(STAMP_DIR)/build-vidalia
diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk
index c12230c..39dffe5 100644
--- a/build-scripts/windows-alpha.mk
+++ b/build-scripts/windows-alpha.mk
@@ -78,7 +78,7 @@ build-qt: build-zlib build-openssl $(QT_DIR)
 	cd $(QT_DIR) && make install
 	touch $(STAMP_DIR)/build-qt
 
-VIDALIA_OPTS=-DCMAKE_EXE_LINKER_FLAGS="-static-libstdc++ -Wl,--nxcompat -Wl,--dynamicbase" -DWIN2K=1 -DQT_QMAKE_EXECUTABLE=$(QT_LIB)/qmake -DCMAKE_BUILD_TYPE=minsizerel -DMINGW_BINARY_DIR=$(MING) -DWIX_BINARY_DIR=$(WIX_LIB) -DSCRIPT_DIR=$(QTSCRIPT_DIR)/plugins/script -DTOR_SOURCE_DIR=$(TOR_DIR)/src/or
+VIDALIA_OPTS=-DCMAKE_EXE_LINKER_FLAGS="-static-libstdc++ -Wl,--nxcompat -Wl,--dynamicbase" -DWIN2K=1 -DQT_QMAKE_EXECUTABLE=$(QT_LIB)/qmake -DCMAKE_BUILD_TYPE=minsizerel -DMINGW_BINARY_DIR=$(MING) -DWIX_BINARY_DIR=$(WIX_LIB)
 # XXX Once we build qt on windows, we'll want to add build-qt here
 build-vidalia: PATH+=:$(QT_LIB)
 build-vidalia: $(VIDALIA_DIR) $(WIX_LIB)