automatically build Scintilla as part of SciTECO's build system:

this should simplify building SciTECO for new users

 * compiler and archiver are passed down from Autoconf,
   so cross-compiling should work transparently
 * `make clean` will also clean the Scintilla source tree
 * there is no longer any need for "source bundles" as
   tar balls also contain Scintilla/Scinterm now
 * building from Git is not much more difficult than building
   from a tar ball
 * The versions of Scintilla/Scinterm embedded as submodules
   already contain all the patches necessary (currently none are
   necessary), so there's no need to have patch files in the
   repository
 * INSTALL instructions have been rewritten
 * the --with-scintilla and --with-scinterm site-config options
   have been kept. But they should be rarely necessary now.

1 files changed, 7 insertions, 39 deletions

diff --git a/distribute b/distribute
index 0f94c44..195ac6a 100755
--- a/distribute
+++ b/distribute
@@ -3,39 +3,10 @@
 SCITECO_VERSION = 0.6
 SCITECO_SRC = sciteco-$(SCITECO_VERSION).tar.gz
 
-SCINTILLA_VERSION = 344
-SCINTILLA_SRC = scintilla$(SCINTILLA_VERSION).tgz
-
-SCINTERM_VERSION = 1.3
-SCINTERM_SRC = scinterm_$(SCINTERM_VERSION).zip
-
 $(SCITECO_SRC):
 	$(MAKE) dist
 
-$(SCINTILLA_SRC):
-	wget -O $@ http://prdownloads.sourceforge.net/scintilla/$(SCINTILLA_SRC)?download
-
-$(SCINTERM_SRC):
-	wget -O $@ http://foicica.com/scinterm/download/$(SCINTERM_SRC)
-
-all : $(SCITECO_SRC) bundle debian mingw-binary
-
-# Create source bundle
-bundle : sciteco-$(SCITECO_VERSION)-bundle.tar.gz
-sciteco-$(SCITECO_VERSION)-bundle.tar.gz : $(SCITECO_SRC) $(SCINTILLA_SRC) $(SCINTERM_SRC)
-	mkdir sciteco-$(SCITECO_VERSION)/
-	(cd sciteco-$(SCITECO_VERSION)/; \
-	 tar xzf ../$(SCITECO_SRC); \
-	 mv sciteco-$(SCITECO_VERSION) sciteco; \
-	 tar xzf ../$(SCINTILLA_SRC); \
-	 unzip -d scintilla/ ../$(SCINTERM_SRC); \
-	 mv scintilla/scinterm_$(SCINTERM_VERSION) scintilla/scinterm; \
-	 for patch in sciteco/patches/*.patch; do \
-		patch --merge -p1 <$$patch; \
-	 done; \
-	)
-	tar czf $@ sciteco-$(SCITECO_VERSION)/
-	rm -rf sciteco-$(SCITECO_VERSION)/
+all : $(SCITECO_SRC) debian mingw-binary
 
 # $(UBUNTU) sets the Ubuntu distribution and fixes the package's
 # version
@@ -43,7 +14,7 @@ debian-prepare: debian-temp/
 debian-temp/ : bundle
 	mkdir debian-temp/
 	(cd debian-temp/; \
-	 cp ../sciteco-$(SCITECO_VERSION)-bundle.tar.gz \
+	 cp ../$(SCITECO_SRC) \
 	    sciteco_$(SCITECO_VERSION).orig.tar.gz; \
 	 tar xzf sciteco_$(SCITECO_VERSION).orig.tar.gz; \
 	 cp -r ../debian sciteco-$(SCITECO_VERSION)/; \
@@ -90,11 +61,9 @@ ppa : debian-source
 	)
 
 mingw-binary : sciteco-$(SCITECO_VERSION)-win32.zip
-sciteco-$(SCITECO_VERSION)-win32.zip : bundle
-	tar xzf sciteco-$(SCITECO_VERSION)-bundle.tar.gz
-	$(MAKE) -C sciteco-$(SCITECO_VERSION)/scintilla/scinterm \
-		CXX=i686-w64-mingw32-g++ AR=i686-w64-mingw32-ar
-	(cd sciteco-$(SCITECO_VERSION)/sciteco; \
+sciteco-$(SCITECO_VERSION)-win32.zip : $(SCITECO_SRC)
+	tar xzf $(SCITECO_SRC)
+	(cd sciteco-$(SCITECO_VERSION); \
 	 ./configure --host=i686-w64-mingw32 --prefix=/ \
 		     --with-interface=pdcurses \
 		     --with-default-scitecopath=lib \
@@ -102,7 +71,7 @@ sciteco-$(SCITECO_VERSION)-win32.zip : bundle
 		     --enable-html-manual \
 		     CFLAGS="-g -O3" CXXFLAGS="-g -O3"; \
 	)
-	$(MAKE) -C sciteco-$(SCITECO_VERSION)/sciteco \
+	$(MAKE) -C sciteco-$(SCITECO_VERSION) \
 		install DESTDIR=`pwd`/temp-install
 	rm -rf sciteco-$(SCITECO_VERSION)/
 	i686-w64-mingw32-strip -s temp-install/bin/*
@@ -118,7 +87,6 @@ sciteco-$(SCITECO_VERSION)-win32.zip : bundle
 	rm -rf temp-bin/
 
 clean:
-	rm -rf $(SCITECO_SRC) $(SCINTILLA_SRC) $(SCINTERM_SRC)
-	rm -rf sciteco-$(SCITECO_VERSION)-bundle.tar.gz
+	rm -rf $(SCITECO_SRC)
 	rm -rf debian-temp/
 	rm -rf sciteco-$(SCITECO_VERSION)/