Mercurial > forge

changeset 2400:93896568396b octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More package manager fixes. fixed point package now builds. audio and gsl and known to be broken packages still
author adb014
date Wed, 23 Aug 2006 22:13:53 +0000
parents 2e15483a2818
children 4f2373c69368
files admin/run_forge main/Makefile main/audio/src/autogen.sh main/fixed/src/Makeconf.in main/fixed/src/Makefile main/fixed/src/configure.base main/fixed/src/fixedCNDArray.h packages/.cvsignore packages/.octaverc packages/Makefile pkg.mk
diffstat 11 files changed, 37 insertions(+), 54 deletions(-) [+]
line wrap: on
line diff
--- a/admin/run_forge	Wed Aug 23 21:42:13 2006 +0000
+++ b/admin/run_forge	Wed Aug 23 22:13:53 2006 +0000
@@ -24,7 +24,7 @@
 # on the system.  We may also want to pick up the OCTAVE_EXEC_PATH if
 # there is one.
 EXECPATH="$PATH:"
-for f in tmp/* main/* extra/* nonfree/*; do
+for f in install/* main/* extra/* nonfree/*; do
     # exclude CVS directories, only include directories, skip NOINSTALL
     case "$f" in
       */CVS) ;;
--- a/main/Makefile	Wed Aug 23 21:42:13 2006 +0000
+++ b/main/Makefile	Wed Aug 23 22:13:53 2006 +0000
@@ -18,12 +18,17 @@
 all: $(patsubst %,dopkg/%,$(BUILDDIRS)) $(patsubst %,dopkg2/%,$(INSTALLDIRS))
 
 dopkg/%:
-	$(MAKE) PKGDIR=$(PKGDIR) -C $(pkg) pkg/$(pkg)
+	$(MAKE) PKGDIR=$(PKGDIR) -C $(opkg) pkg/$(opkg)
 
 dopkg2/%:
-	ver=`grep "Version:" $(pkg)/DESCRIPTION | sed -e "s/Version: *//"`; \
-	tar -zcf $(PKGDIR)/$(pkg)-$$ver.tar.gz $(REAL_PKG_FILES)
-
+	if [ -f $(opkg)/src/autogen.sh ]; then \
+	  p=`pwd`; \
+          cd $(opkg)/src; \
+          sh ./autogen.sh; \
+          cd $$p; \
+	fi
+	ver=`grep "Version:" $(opkg)/DESCRIPTION | sed -e "s/Version: *//"`; \
+	tar -zcf $(PKGDIR)/$(opkg)-$$ver.tar.gz $(REAL_PKG_FILES)
 else
 all:
 	@echo not yet configured
--- a/main/audio/src/autogen.sh	Wed Aug 23 21:42:13 2006 +0000
+++ b/main/audio/src/autogen.sh	Wed Aug 23 22:13:53 2006 +0000
@@ -4,10 +4,6 @@
 rm -f configure.in
 echo "dnl --- DO NOT EDIT --- Automatically generated by autogen.sh" > configure.in
 cat configure.base >> configure.in
-files=`find . -name configure.add -print`
-if test ! -z "$files" ; then
-  cat $files >> configure.in
-fi
 cat <<EOF >> configure.in
   AC_OUTPUT(\$CONFIGURE_OUTPUTS)
   dnl XXX FIXME XXX chmod is not in autoconf's list of portable functions
@@ -23,11 +19,3 @@
 
 autoconf && rm -f configure.in
 
-## Generate ./Makeconf.in
-rm -f Makeconf.in
-cp Makeconf.base Makeconf.in
-files=`find . -name Makeconf.add -print`
-if test ! -z "$files" ; then
-  cat $files >> Makeconf.in
-fi
-
--- a/main/fixed/src/Makeconf.in	Wed Aug 23 21:42:13 2006 +0000
+++ b/main/fixed/src/Makeconf.in	Wed Aug 23 22:13:53 2006 +0000
@@ -55,10 +55,6 @@
 MKOCTFILE = @MKOCTFILE@ -DHAVE_OCTAVE_$(ver) -v
 SHLEXT = @SHLEXT@
 
-@DEFHAVE_X@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-
 ver = @ver@
 MPATH = @mpath@
 OPATH = @opath@
@@ -66,17 +62,6 @@
 ALTMPATH = @altmpath@
 ALTOPATH = @altopath@
 
-HAVE_DO_FORTRAN_INDEXING = @HAVE_DO_FORTRAN_INDEXING@
-HAVE_PROPAGATE_EMPTY_MATRICES = @HAVE_PROPAGATE_EMPTY_MATRICES@
-HAVE_OK_TO_LOSE_IMAGINARY_PART = @HAVE_OK_TO_LOSE_IMAGINARY_PART@
-HAVE_ND_ARRAYS = @HAVE_ND_ARRAYS@
-TYPEID_HAS_CLASS = @TYPEID_HAS_CLASS@
-CLASS_HAS_LOAD_SAVE = @CLASS_HAS_LOAD_SAVE@
-HAVE_OCTAVE_MAP_INDEX = @HAVE_OCTAVE_MAP_INDEX@
-HAVE_OCTAVE_CONCAT = @HAVE_OCTAVE_CONCAT@
-HAVE_SWAP_BYTES = @HAVE_SWAP_BYTES@
-HAVE_OCTAVE_UPLUS = @HAVE_OCTAVE_UPLUS@
-
 MAKEINFO = @MAKEINFO@
 TEXI2DVI = @TEXI2DVI@
 TEXI2HTML = @TEXI2HTML@
--- a/main/fixed/src/Makefile	Wed Aug 23 21:42:13 2006 +0000
+++ b/main/fixed/src/Makefile	Wed Aug 23 22:13:53 2006 +0000
@@ -3,7 +3,7 @@
 FIXEDVERTARGET = fixedversion.h
 FIXEDTARGET = fixed.oct 
 
-SUBDIRS = examples doc
+SUBDIRS =
 
 ifeq (,$(findstring cygwin,$(canonical_host_type)))
  ifeq (,$(findstring mingw,$(canonical_host_type)))
--- a/main/fixed/src/configure.base	Wed Aug 23 21:42:13 2006 +0000
+++ b/main/fixed/src/configure.base	Wed Aug 23 22:13:53 2006 +0000
@@ -398,7 +398,6 @@
 octave-forge is configured with
    octave:      $OCTAVE (version $OCTAVE_VERSION)
    mkoctfile:	$MKOCTFILE for Octave $subver
-   X11 support:	$XSTATUS
    makeinfo:    $MAKEINFO
    texi2dvi:    $TEXI2DVI
    texi2html:   $TEXI2HTML
--- a/main/fixed/src/fixedCNDArray.h	Wed Aug 23 21:42:13 2006 +0000
+++ b/main/fixed/src/fixedCNDArray.h	Wed Aug 23 22:13:53 2006 +0000
@@ -23,7 +23,7 @@
 
 */
 
-#if !defined (octave_FixedCNDArray_h) && defined (HAVE_ND_ARRAYS)
+#if !defined (octave_FixedCNDArray_h)
 #define octave_FixedCNDArray_h 1
 
 #include <octave/MArrayN.h>
--- a/packages/.cvsignore	Wed Aug 23 21:42:13 2006 +0000
+++ b/packages/.cvsignore	Wed Aug 23 22:13:53 2006 +0000
@@ -1,5 +1,7 @@
 *.tar.gz
-octave
+install
 .octave_packages
+.octave_hist
 tmp
+build-stamp
 *~
--- a/packages/.octaverc	Wed Aug 23 21:42:13 2006 +0000
+++ b/packages/.octaverc	Wed Aug 23 22:13:53 2006 +0000
@@ -1,2 +1,2 @@
 global OCTAVE_PACKAGE_PREFIX;
-OCTAVE_PACKAGE_PREFIX='./tmp';
+OCTAVE_PACKAGE_PREFIX=[pwd() '/install'];
--- a/packages/Makefile	Wed Aug 23 21:42:13 2006 +0000
+++ b/packages/Makefile	Wed Aug 23 22:13:53 2006 +0000
@@ -10,23 +10,26 @@
 BUNDLE = octave-forge.tar.gz
 PACKAGES = $(filter-out $(BUNDLE), $(wildcard *.tar.gz))
 
-.PHONY: $(PACKAGES)
+.PHONY: $(PACKAGES) .tar.gz
 
 # Do nothing for the all target 
 all:
 
 # Assume all packages have .tar.gz extensions
-clean:
-	rm *.tar.gz *~ build-stamp .octave-packages
-	rm -fr install
+mostlyclean: 
+	@rm -fr install *~ build-stamp .octave_packages
+
+clean: mostlyclean
+	@rm -f *.tar.gz
 
 check: build-stamp
 	../admin/run_forge
 
 build-stamp: $(PACKAGES)
-	touch build-stamp
+	@touch build-stamp
 
 # No spaces in eval argumnet please!!
 $(PACKAGES) :
-	if [! -d octave/ ]; then mkdir octave; fi
+	@echo "build $@"
+	if [ ! -d install ]; then mkdir install; fi
 	$(RUN_OCTAVE) --eval "pkg('install','$@')"
--- a/pkg.mk	Wed Aug 23 21:42:13 2006 +0000
+++ b/pkg.mk	Wed Aug 23 22:13:53 2006 +0000
@@ -1,20 +1,20 @@
 # These are stub rules for the construction of packages
 
-pkg = $(filter-out %/,$(subst /,/ ,$@))
+opkg = $(filter-out %/,$(subst /,/ ,$@))
 ifeq ($(PKG_FILE),)
 # Use the wildcard on INDEX and PKG_ADD as well to allow for their absence
-PKG_FILES = $(pkg)/COPYING $(pkg)/DESCRIPTION \
-	$(wildcard $(pkg)/INDEX) $(wildcard $(pkg)/PKG_ADD) \
-	$(wildcard $(pkg)/inst/*) $(wildcard $(pkg)/src/*)
+PKG_FILES = $(opkg)/COPYING $(opkg)/DESCRIPTION \
+	$(wildcard $(opkg)/INDEX) $(wildcard $(opkg)/PKG_ADD) \
+	$(wildcard $(opkg)/inst/*) $(wildcard $(opkg)/src/*)
 endif
-REAL_PKG_FILES = $(filter-out $(pkg)/%/CVS $(pkg)/%/.cvsignore %~, $(PKG_FILES))
+REAL_PKG_FILES = $(filter-out $(opkg)/%/CVS $(opkg)/%/.cvsignore %~ %/autom4te.cache, $(PKG_FILES))
 
 pkg/%: pre-pkg/%
 	cd ..; \
-	ver=`grep "Version:" $(pkg)/DESCRIPTION | sed -e "s/Version: *//"`; \
-	tar -zcf $(PKGDIR)/$(pkg)-$$ver.tar.gz $(REAL_PKG_FILES); \
-	cd $(pkg); \
-	$(MAKE) post-pkg/$(pkg)
+	ver=`grep "Version:" $(opkg)/DESCRIPTION | sed -e "s/Version: *//"`; \
+	tar -zcf $(PKGDIR)/$(opkg)-$$ver.tar.gz $(REAL_PKG_FILES); \
+	cd $(opkg); \
+	$(MAKE) post-pkg/$(opkg)
 
 pre-pkg/%::
 	if [ -f src/autogen.sh ]; then \
@@ -23,6 +23,7 @@
           cd ..; \
 	fi
 
-# By default do nothing post packaging. Therefore trailing TAB is important!!!
+# By default do nothing post packaging
 post-pkg/%::
-	
+	@true
+