From: ms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Date: Thu, 6 Mar 2008 19:12:31 +0000 (+0000)
Subject: Added urlgrabber.
X-Git-Tag: v3.0-alpha1~1092
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f4f2e381faef80dace62c235b995dab17e7af559;p=ipfire-3.x.git

Added urlgrabber.
Moved the python modules in an extra lfs script.


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@1255 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
---

diff --git a/lfs/python b/lfs/python
index 19d96433d..15a5b2fad 100644
--- a/lfs/python
+++ b/lfs/python
@@ -27,22 +27,17 @@ include Config
 PKG_NAME   = Python
 VER        = 2.5.1
 
-ICONV      = iconvmodule-1.0-ipfire-1
-DBUSPY     = dbus-python-0.82.0
-
 THISAPP    = $(PKG_NAME)-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
 TARGET     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
-MODULES    = $(DIR_SRC)/$(ICONV) $(DIR_SRC)/$(DBUSPY)
-
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) $(ICONV).tar.bz2 $(DBUSPY).tar.gz
+objects = $(DL_FILE)
 
 install: $(TARGET)
 
@@ -57,20 +52,9 @@ $(patsubst %,$(DIR_DL)/%,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) $(MODULES) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && OPT="$(CFLAGS)" ./configure --prefix=/usr --enable-shared
 	cd $(DIR_APP) && make -j $(PARALLELISM)
 	cd $(DIR_APP) && make install
-	
-	### Building optional modules
-	#
-	cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(ICONV).tar.bz2
-	cd $(DIR_SRC)/$(ICONV) && make install
-	
-	cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DBUSPY).tar.gz
-	cd $(DIR_SRC)/$(DBUSPY) && ./configure --prefix=/usr
-	cd $(DIR_SRC)/$(DBUSPY) && make
-	cd $(DIR_SRC)/$(DBUSPY) && make install
-	
-	@rm -rf $(DIR_APP) $(MODULES)
+	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/lfs/python-modules b/lfs/python-modules
new file mode 100644
index 000000000..e0f6644df
--- /dev/null
+++ b/lfs/python-modules
@@ -0,0 +1,74 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+PKG_NAME   = python-modules
+VER        = ipfire
+
+THISAPP    = $(PKG_NAME)-$(VER)
+ICONV      = iconvmodule-1.0-ipfire-1
+DBUSPY     = dbus-python-0.82.0
+URLGRABBER = urlgrabber-3.1.0
+
+TARGET     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
+
+DIR_MOD    = $(DIR_SRC)/$(THISAPP)
+MODULES    = $(DIR_SRC)/$(ICONV) $(DIR_SRC)/$(DBUSPY) $(DIR_SRC)/$(URLGRABBER)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(ICONV).tar.bz2 $(DBUSPY).tar.gz $(URLGRABBER).tar.gz
+
+install: $(TARGET)
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+	@$(LOAD)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+	@$(PREBUILD)
+	@rm -rf $(DIR_MOD)
+	@mkdir -p $(DIR_MOD)
+	
+	cd $(DIR_MOD) && tar jxf $(DIR_DL)/$(ICONV).tar.bz2
+	cd $(DIR_MOD)/$(ICONV) && make install
+	
+	cd $(DIR_MOD) && tar zxf $(DIR_DL)/$(DBUSPY).tar.gz
+	cd $(DIR_MOD)/$(DBUSPY) && ./configure --prefix=/usr
+	cd $(DIR_MOD)/$(DBUSPY) && make
+	cd $(DIR_MOD)/$(DBUSPY) && make install
+	
+	cd $(DIR_MOD) && tar zxf $(DIR_DL)/$(URLGRABBER).tar.gz
+	cd $(DIR_MOD)/$(URLGRABBER) && python setup.py install
+	
+	@rm -rf $(DIR_MOD)
+	@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 7284e617f..a18ba72a4 100755
--- a/make.sh
+++ b/make.sh
@@ -177,6 +177,7 @@ ipfire_build() {
 	ipfire_make openssl
 	ipfire_make perl			### We are building the modules here.
 	ipfire_make python
+	ipfire_make python-modules
 	ipfire_make libxml2
 	ipfire_make libxslt
 	ipfire_make gmp
@@ -217,7 +218,7 @@ ipfire_build() {
 	ipfire_make curl
 	ipfire_make gnupg
 	ipfire_make sudo
-	#ipfire_make libjpeg	### Do we need this?
+	#ipfire_make libjpeg
 	ipfire_make libpng
 	ipfire_make libtiff
 	ipfire_make libart