# HG changeset patch # User John W. Eaton # Date 1389842560 18000 # Node ID 1ac93670d0bc12cc807df87b384afb4705a8e23e # Parent 8ed872f9dbc796e130c00ae86652ea85c479a84c# Parent da62528d53fb7490281198c7f7d1a235feae4db2 merge away extra head on default diff -r 8ed872f9dbc7 -r 1ac93670d0bc Makefile.in --- a/Makefile.in Sun Jan 12 17:11:15 2014 -0500 +++ b/Makefile.in Wed Jan 15 22:22:40 2014 -0500 @@ -350,7 +350,7 @@ endif OCTAVE_FORGE_BASE_URL := 'http://sourceforge.net/projects/octave/files/Octave Forge Packages/Individual Package Releases' -OCTAVE_FORGE_PACKAGES := $(addprefix of-,miscellaneous struct optim specfun general signal communications image io statistics control geometry windows odepkg linear-algebra sockets zenity actuarial data-smoothing fuzzy-logic-toolkit quaternion fits) +OCTAVE_FORGE_PACKAGES := $(addprefix of-,miscellaneous struct optim specfun general signal communications image io statistics control geometry windows odepkg linear-algebra sockets zenity actuarial data-smoothing fuzzy-logic-toolkit quaternion fits fl-core tsa dicom) MAKE_SHARED_FROM_STATIC := \ $(TOP_DIR)/tools/make-shared-from-static $(MAKE_SHARED_FROM_STATIC_OPTIONS) diff -r 8ed872f9dbc7 -r 1ac93670d0bc build_packages.m --- a/build_packages.m Sun Jan 12 17:11:15 2014 -0500 +++ b/build_packages.m Wed Jan 15 22:22:40 2014 -0500 @@ -22,4 +22,7 @@ pkg install fuzzy-logic-toolkit-0.4.2.tar.gz pkg install quaternion-2.2.0.tar.gz pkg install fits-1.0.3.tar.gz +pkg install fl-core-1.0.0.tar.gz +pkg install tsa-4.2.7.tar.gz +pkg install dicom-0.1.1.tar.gz diff -r 8ed872f9dbc7 -r 1ac93670d0bc dist-files.mk --- a/dist-files.mk Sun Jan 12 17:11:15 2014 -0500 +++ b/dist-files.mk Wed Jan 15 22:22:40 2014 -0500 @@ -384,8 +384,11 @@ of-communications.mk \ of-control.mk \ of-data-smoothing.mk \ + of-dicom.mk \ of-fits.mk \ of-fits-1-fixes.patch \ + of-fl-core.mk \ + of-fl-core-1-fixes.patch \ of-fuzzy-logic-toolkit.mk \ of-general.mk \ of-geometry.mk \ @@ -403,6 +406,7 @@ of-specfun.mk \ of-statistics.mk \ of-struct.mk \ + of-tsa.mk \ of-windows.mk \ of-zenity.mk \ ogg.mk \ diff -r 8ed872f9dbc7 -r 1ac93670d0bc index.html --- a/index.html Sun Jan 12 17:11:15 2014 -0500 +++ b/index.html Wed Jan 15 22:22:40 2014 -0500 @@ -1238,7 +1238,7 @@ gdcm - 2.2.3 + 2.0.19 GDCM @@ -1963,11 +1963,21 @@ Octave Forge data-smoothing package + of-fits + 0.1.1 + Octave Forge dicom package + + of-fits 1.0.3 Octave Forge fits package + of-fl-core + 1.0.0 + Octave Forge fl-core package + + of-fuzzy-logic-toolkit 0.4.2 Octave Forge fuzzy-logic-toolkit package @@ -2043,6 +2053,11 @@ Octave Forge struct package + of-tsa + 4.2.7 + Octave Forge tsa package + + of-windows 1.2.1 Octave Forge struct package diff -r 8ed872f9dbc7 -r 1ac93670d0bc makeinst-script.sh --- a/makeinst-script.sh Sun Jan 12 17:11:15 2014 -0500 +++ b/makeinst-script.sh Wed Jan 15 22:22:40 2014 -0500 @@ -93,9 +93,9 @@ ; set up checkbox to create desktop icon Function finishpage_desktopshortcut - SetOutPath "\$INSTDIR\\bin" - CreateShortCut "\$desktop\\Octave-$VERSION.lnk" "\$INSTDIR\\bin\\octave.exe" "" "\$INSTDIR\\$ICON" 0 - CreateShortCut "\$desktop\\Octave-$VERSION (Experimental GUI).lnk" "\$INSTDIR\\libexec\\octave\\$OCTAVE_VERSION\\exec\\i686-pc-mingw32\\octave-gui.exe" "" "\$INSTDIR\\$ICON" 0 + SetOutPath "%USERPROFILE%" + CreateShortCut "\$desktop\\Octave-$VERSION (Command Line).lnk" "\$INSTDIR\\bin\\octave-cli.exe" "" "\$INSTDIR\\$ICON" 0 + CreateShortCut "\$desktop\\Octave-$VERSION (Experimental GUI).lnk" "\$INSTDIR\\bin\\octave-gui.exe" "" "\$INSTDIR\\$ICON" 0 FunctionEnd !define MUI_FINISHPAGE_SHOWREADME "" @@ -144,8 +144,8 @@ ; add qt.conf Push \$0 \${StrRep} '\$0' '\$INSTDIR' '\\' '/' - WriteINIStr "\$INSTDIR\\libexec\\octave\\$OCTAVE_VERSION\\exec\\i686-pc-mingw32\\qt.conf" "Paths" "Prefix" "\$0" - WriteINIStr "\$INSTDIR\\libexec\\octave\\$OCTAVE_VERSION\\exec\\i686-pc-mingw32\\qt.conf" "Paths" "Translations" "translations" + WriteINIStr "\$INSTDIR\\bin\\qt.conf" "Paths" "Prefix" "\$0" + WriteINIStr "\$INSTDIR\\bin\\qt.conf" "Paths" "Translations" "translations" Pop \$0 SectionEnd @@ -165,9 +165,9 @@ CreateDirectory "\$SMPROGRAMS\\Octave-$VERSION" CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Uninstall.lnk" "\$INSTDIR\\uninstall.exe" "" "\$INSTDIR\\uninstall.exe" 0 - SetOutPath "\$INSTDIR\\bin" - CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Octave.lnk" "\$INSTDIR\\bin\\octave.exe" "" "\$INSTDIR\\$ICON" 0 - CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Octave (Experimental GUI).lnk" "\$INSTDIR\\libexec\\octave\\$OCTAVE_VERSION\\exec\\i686-pc-mingw32\\octave-gui.exe" "" "\$INSTDIR\\$ICON" 0 + SetOutPath "%USERPROFILE%" + CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Octave (Command Line).lnk" "\$INSTDIR\\bin\\octave-cli.exe" "" "\$INSTDIR\\$ICON" 0 + CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Octave (Experimental GUI).lnk" "\$INSTDIR\\bin\\octave-gui.exe" "" "\$INSTDIR\\$ICON" 0 SetOutPath "\$INSTDIR" EOF # if we have documentation files, create shortcuts @@ -196,11 +196,11 @@ Delete "\$SMPROGRAMS\\Octave-$VERSION\\*.*" RMDir "\$SMPROGRAMS\\Octave-$VERSION" - Delete "\$desktop\\Octave-$VERSION.lnk" + Delete "\$desktop\\Octave-$VERSION (Command Line).lnk" Delete "\$desktop\\Octave-$VERSION (Experimental GUI).lnk" ; delete generated qt.conf file - Delete "\$INSTDIR\\libexec\\octave\\$OCTAVE_VERSION\\exec\\i686-pc-mingw32\\qt.conf" + Delete "\$INSTDIR\\bin\\qt.conf" EOF # insert dir list (backwards order) for uninstall files diff -r 8ed872f9dbc7 -r 1ac93670d0bc src/cfitsio.mk --- a/src/cfitsio.mk Sun Jan 12 17:11:15 2014 -0500 +++ b/src/cfitsio.mk Wed Jan 15 22:22:40 2014 -0500 @@ -3,7 +3,7 @@ PKG := cfitsio $(PKG)_IGNORE := -$(PKG)_CHECKSUM := 4870380013d089e1e9b8994d74f15482decffc1c +$(PKG)_CHECKSUM := e928832708d6a5df21a1e17ae4a63036cab7c1b9 $(PKG)_SUBDIR := $(PKG) $(PKG)_FILE := $(PKG)$(subst .,,$($(PKG)_VERSION)).tar.gz $(PKG)_URL := ftp://heasarc.gsfc.nasa.gov/software/$(PKG)/c/$($(PKG)_FILE) diff -r 8ed872f9dbc7 -r 1ac93670d0bc src/gdcm.mk --- a/src/gdcm.mk Sun Jan 12 17:11:15 2014 -0500 +++ b/src/gdcm.mk Wed Jan 15 22:22:40 2014 -0500 @@ -3,7 +3,7 @@ PKG := gdcm $(PKG)_IGNORE := -$(PKG)_CHECKSUM := 83b9ff0744a37b4bf8f687ed198aabea7a9dfc70 +$(PKG)_CHECKSUM := ffbf5c1d040ec12d34fd7a7576633dfe0a1ff7b3 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG) 2.x/GDCM $($(PKG)_VERSION)/$($(PKG)_FILE) @@ -44,7 +44,7 @@ -DGDCM_BUILD_SHARED_LIBS:BOOL=TRUE \ ../$($(PKG)_SUBDIR) make -C $(1)/../.build -j $(JOBS) - make -C $(1)/../.build -j 1 install + make -C $(1)/../.build -j 1 install DESTDIR=$(3) endef endif diff -r 8ed872f9dbc7 -r 1ac93670d0bc src/libgomp.mk --- a/src/libgomp.mk Sun Jan 12 17:11:15 2014 -0500 +++ b/src/libgomp.mk Wed Jan 15 22:22:40 2014 -0500 @@ -19,15 +19,16 @@ cd '$(1)/build/$(TARGET)/libgomp' && '$(1)/libgomp/configure' \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --target='$(TARGET)' \ - --prefix='$(BUILD_TOOLS_PREFIX)' \ + --prefix='$(HOST_PREFIX)' \ --enable-version-specific-runtime-libs \ --with-gnu-ld \ $(ENABLE_SHARED_OR_STATIC) \ LIBS='-lws2_32' - $(MAKE) -C '$(1)/build/$(TARGET)/libgomp' -j '$(JOBS)' install + $(MAKE) -C '$(1)/build/$(TARGET)/libgomp' -j '$(JOBS)' + $(MAKE) -C '$(1)/build/$(TARGET)/libgomp' -j '1' install DESTDIR='$(3)' - '$(MXE_CC)' \ - -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(HOST_BINDIR)/test-libgomp.exe' \ - -fopenmp + #'$(MXE_CC)' \ + # -W -Wall -Werror -ansi -pedantic \ + # '$(2).c' -o '$(HOST_BINDIR)/test-libgomp.exe' \ + # -fopenmp endef diff -r 8ed872f9dbc7 -r 1ac93670d0bc src/octave.mk --- a/src/octave.mk Sun Jan 12 17:11:15 2014 -0500 +++ b/src/octave.mk Wed Jan 15 22:22:40 2014 -0500 @@ -83,7 +83,7 @@ define $(PKG)_BUILD # jni install - if [[ "$(MXE_SYSTEM)" == "mingw" && "$(MXE_NATIVE_BUILD)" == "no" ]]; then \ + if [[ "$(MXE_SYSTEM)" == "mingw" && "$(MXE_NATIVE_BUILD)" == "no" && "$(ENABLE_JAVA)" == "yes" ]]; then \ mkdir -p '$(HOST_INCDIR)/java/include'; \ $(WGET) -N http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/raw-file/tip/src/share/javavm/export/jni.h \ -O $(HOST_INCDIR)/java/include/jni.h; \ @@ -114,6 +114,10 @@ ## in a directory tree that will have just Octave files. $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)' + if [ "x$(MXE_SYSTEM)" == "xmingw" ]; then \ + cp '$(1)/.build/src/.libs/octave-gui.exe' '$(3)$(HOST_BINDIR)'; \ + fi + if [ "x$(ENABLE_DOCS)" == "xyes" ]; then \ $(MAKE) -C '$(1)/.build' -j '$(JOBS)' DESTDIR=$(3) install-pdf install-html; \ fi diff -r 8ed872f9dbc7 -r 1ac93670d0bc src/of-dicom.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/of-dicom.mk Wed Jan 15 22:22:40 2014 -0500 @@ -0,0 +1,20 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := of-dicom +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := dfb7eccf6ccc39e52c27a5d885984eaa3a55d3d4 +$(PKG)_REMOTE_SUBDIR := +$(PKG)_SUBDIR := dicom +$(PKG)_FILE := dicom-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/octave/$($(PKG)_FILE)?download +$(PKG)_DEPS := gdcm + +define $(PKG)_UPDATE + echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2; + echo $($(PKG)_VERSION) +endef + +define $(PKG)_BUILD + $(OCTAVE_FORGE_PKG_BUILD) +endef diff -r 8ed872f9dbc7 -r 1ac93670d0bc src/of-fl-core-1-fixes.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/of-fl-core-1-fixes.patch Wed Jan 15 22:22:40 2014 -0500 @@ -0,0 +1,18 @@ +diff -ur fl-core.orig/src/Makefile fl-core/src/Makefile +--- fl-core.orig/src/Makefile 2014-01-13 21:23:20.000000000 -0500 ++++ fl-core/src/Makefile 2014-01-13 21:24:15.000000000 -0500 +@@ -1,8 +1,13 @@ + OCT = fl_compose.oct + SRC := $(OCT:.oct=.cc) + BASE := $(OCT:.oct=) +-ifdef COMSPEC ++ ++ifneq (,$(findstring mingw,$(shell octave-config -p CANONICAL_HOST_TYPE))) ++ ADDPARAM := -lpthread ++else ++ ifdef COMSPEC + ADDPARAM := -lpthreadVC2 ++ endif + endif + + .phony: all diff -r 8ed872f9dbc7 -r 1ac93670d0bc src/of-fl-core.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/of-fl-core.mk Wed Jan 15 22:22:40 2014 -0500 @@ -0,0 +1,20 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := of-fl-core +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := 15c22155457f2eaf3d2531cd8a652732d9b7ebce +$(PKG)_REMOTE_SUBDIR := +$(PKG)_SUBDIR := fl-core +$(PKG)_FILE := fl-core-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/octave/$($(PKG)_FILE)?download +$(PKG)_DEPS := + +define $(PKG)_UPDATE + echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2; + echo $($(PKG)_VERSION) +endef + +define $(PKG)_BUILD + $(OCTAVE_FORGE_PKG_BUILD) +endef diff -r 8ed872f9dbc7 -r 1ac93670d0bc src/of-tsa.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/of-tsa.mk Wed Jan 15 22:22:40 2014 -0500 @@ -0,0 +1,20 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := of-tsa +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := 80d2faa61c32043bf1edc2c0fa48fe0c00eacd89 +$(PKG)_REMOTE_SUBDIR := +$(PKG)_SUBDIR := tsa +$(PKG)_FILE := tsa-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/octave/$($(PKG)_FILE)?download +$(PKG)_DEPS := libgomp + +define $(PKG)_UPDATE + echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2; + echo $($(PKG)_VERSION) +endef + +define $(PKG)_BUILD + $(OCTAVE_FORGE_PKG_BUILD) +endef diff -r 8ed872f9dbc7 -r 1ac93670d0bc src/stable-octave.mk --- a/src/stable-octave.mk Sun Jan 12 17:11:15 2014 -0500 +++ b/src/stable-octave.mk Wed Jan 15 22:22:40 2014 -0500 @@ -83,7 +83,7 @@ define $(PKG)_BUILD # jni install - if [[ "$(MXE_SYSTEM)" == "mingw" && "$(MXE_NATIVE_BUILD)" == "no" ]]; then \ + if [[ "$(MXE_SYSTEM)" == "mingw" && "$(MXE_NATIVE_BUILD)" == "no" && "$(ENABLE_JAVA)" == "yes" ]]; then \ mkdir -p '$(HOST_INCDIR)/java/include'; \ $(WGET) -N http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/raw-file/tip/src/share/javavm/export/jni.h \ -O $(HOST_INCDIR)/java/include/jni.h; \ @@ -114,6 +114,10 @@ ## in a directory tree that will have just Octave files. $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)' + if [ "x$(MXE_SYSTEM)" == "xmingw" ]; then \ + cp '$(1)/.build/src/.libs/octave-gui.exe' '$(3)$(HOST_BINDIR)'; \ + fi + if [ "x$(ENABLE_DOCS)" == "xyes" ]; then \ $(MAKE) -C '$(1)/.build' -j '$(JOBS)' DESTDIR=$(3) install-pdf install-html; \ fi