Mercurial > mxe-octave

changeset 3345:290e049823c9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Octave-forge pks: support file listing and pre-compilation (for MSVC). * Makefile.in (OCTAVE_FORGE_PKG_BUILD): New variable. * src/of-communications.mk: Use it, define $(PKG)_SUBDIR. * src/of-control.mk: Likewise. * src/of-general.mk: Likewise. * src/of-image.mk: Likewise. * src/of-io.mk: Likewise. * src/of-miscellaneous.mk: Likewise. * src/of-optim.mk: Likewise. * src/of-signal.mk: Likewise. * src/of-specfun.mk: Likewise. * src/of-statistics.mk: Likewise. * src/of-struct.mk: Likewise. * src/of-windows.mk: Likewise.
author Michael Goffioul <michael.goffioul@gmail.com>
date Sun, 01 Dec 2013 12:38:39 -0500
parents b799b3f81a1e
children e9741f369ee4 6f2e5cb52f84
files Makefile.in src/of-communications.mk src/of-control.mk src/of-general.mk src/of-image.mk src/of-io.mk src/of-miscellaneous.mk src/of-optim.mk src/of-signal.mk src/of-specfun.mk src/of-statistics.mk src/of-struct.mk src/of-windows.mk
diffstat 13 files changed, 46 insertions(+), 43 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.in	Sun Dec 01 12:35:03 2013 -0500
+++ b/Makefile.in	Sun Dec 01 12:38:39 2013 -0500
@@ -514,6 +514,25 @@
     fi
 endef
 
+ifeq ($(MXE_SYSTEM),msvc)
+define OCTAVE_FORGE_PKG_BUILD
+    $(INSTALL) -d '$(3)$(HOST_PREFIX)/local/octave-$(octave_VERSION)/share/octave'
+    $(INSTALL) -d '$(3)$(HOST_PREFIX)/local/octave-$(octave_VERSION)/lib/octave'
+    cd '$(1)/..' && tar cvfz $($(PKG)_FILE) $($(PKG)_SUBDIR)
+    cd '$(1)/..' && $(HOST_PREFIX)/local/octave-$(octave_VERSION)/bin/octave-cli.exe -H -f -q \
+        --eval "more off;" \
+        --eval "pkg('prefix', '`cd "$(3)" && pwd -W`$(HOST_PREFIX)/local/octave-$(octave_VERSION)/share/octave/packages', '`cd "$(3)" && pwd -W`$(HOST_PREFIX)/local/octave-$(octave_VERSION)/lib/octave/packages');" \
+	--eval "pkg('install', '-verbose', '$($(PKG)_FILE)');"
+endef
+else
+define OCTAVE_FORGE_PKG_BUILD
+    mkdir -p '$(3)$(HOST_PREFIX)/src'
+    cd '$(1)/..' \
+      && tar cvfz $($(PKG)_FILE) $($(PKG)_SUBDIR) \
+      && $(INSTALL) -m644 '$(PKG_DIR)/$($(PKG)_FILE)' '$(3)$(HOST_PREFIX)/src'
+endef
+endif
+
 define PKG_RULE
 .PHONY: download-$(1)
 download-$(1): $(addprefix download-,$($(1)_DEPS))
--- a/src/of-communications.mk	Sun Dec 01 12:35:03 2013 -0500
+++ b/src/of-communications.mk	Sun Dec 01 12:38:39 2013 -0500
@@ -9,7 +9,7 @@
 $(PKG)_FILE     := communications-$($(PKG)_VERSION).tar.gz
 $(PKG)_FIXED_FILE := communications-$($(PKG)_VERSION)a.tar.gz
 $(PKG)_URL      := '$(OCTAVE_FORGE_BASE_URL)/$($(PKG)_FILE)/download'
-$(PKG)_DEPS     := 
+$(PKG)_DEPS     := of-signal
 
 define $(PKG)_UPDATE
     echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
@@ -17,8 +17,5 @@
 endef
 
 define $(PKG)_BUILD
-    mkdir -p '$(HOST_PREFIX)/src'
-    cd '$(1)/..' \
-      && tar czf $($(PKG)_FIXED_FILE) $($(PKG)_SUBDIR) \
-      && $(INSTALL) -m644 '$($(PKG)_FIXED_FILE)' '$(HOST_PREFIX)/src'
+    $(OCTAVE_FORGE_PKG_BUILD)
 endef
--- a/src/of-control.mk	Sun Dec 01 12:35:03 2013 -0500
+++ b/src/of-control.mk	Sun Dec 01 12:38:39 2013 -0500
@@ -5,7 +5,7 @@
 $(PKG)_IGNORE   :=
 $(PKG)_CHECKSUM := c99e049fda72300a3e77a763b9c5a00829f91c0f
 $(PKG)_REMOTE_SUBDIR := 
-$(PKG)_SUBDIR   := 
+$(PKG)_SUBDIR   := control
 $(PKG)_FILE     := control-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := '$(OCTAVE_FORGE_BASE_URL)/$($(PKG)_FILE)/download'
 $(PKG)_DEPS     := 
@@ -16,6 +16,5 @@
 endef
 
 define $(PKG)_BUILD
-    mkdir -p '$(HOST_PREFIX)/src'
-    $(INSTALL) -m644 '$(PKG_DIR)/$($(PKG)_FILE)' '$(HOST_PREFIX)/src'
+    $(OCTAVE_FORGE_PKG_BUILD)
 endef
--- a/src/of-general.mk	Sun Dec 01 12:35:03 2013 -0500
+++ b/src/of-general.mk	Sun Dec 01 12:38:39 2013 -0500
@@ -5,7 +5,7 @@
 $(PKG)_IGNORE   :=
 $(PKG)_CHECKSUM := 1662d97f0bf1be957e1a30a287d9c0aff7b5ecdd
 $(PKG)_REMOTE_SUBDIR := 
-$(PKG)_SUBDIR   := 
+$(PKG)_SUBDIR   := general
 $(PKG)_FILE     := general-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := '$(OCTAVE_FORGE_BASE_URL)/$($(PKG)_FILE)/download'
 $(PKG)_DEPS     := 
@@ -16,6 +16,5 @@
 endef
 
 define $(PKG)_BUILD
-    mkdir -p '$(HOST_PREFIX)/src'
-    $(INSTALL) -m644 '$(PKG_DIR)/$($(PKG)_FILE)' '$(HOST_PREFIX)/src'
+    $(OCTAVE_FORGE_PKG_BUILD)
 endef
--- a/src/of-image.mk	Sun Dec 01 12:35:03 2013 -0500
+++ b/src/of-image.mk	Sun Dec 01 12:38:39 2013 -0500
@@ -5,10 +5,10 @@
 $(PKG)_IGNORE   :=
 $(PKG)_CHECKSUM := 30f33db706e8892f120f2d79e030c3f21dea4563
 $(PKG)_REMOTE_SUBDIR := 
-$(PKG)_SUBDIR   := 
+$(PKG)_SUBDIR   := image
 $(PKG)_FILE     := image-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := '$(OCTAVE_FORGE_BASE_URL)/$($(PKG)_FILE)/download'
-$(PKG)_DEPS     := 
+$(PKG)_DEPS     := of-signal
 
 define $(PKG)_UPDATE
     echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
@@ -16,6 +16,5 @@
 endef
 
 define $(PKG)_BUILD
-    mkdir -p '$(HOST_PREFIX)/src'
-    $(INSTALL) -m644 '$(PKG_DIR)/$($(PKG)_FILE)' '$(HOST_PREFIX)/src'
+    $(OCTAVE_FORGE_PKG_BUILD)
 endef
--- a/src/of-io.mk	Sun Dec 01 12:35:03 2013 -0500
+++ b/src/of-io.mk	Sun Dec 01 12:38:39 2013 -0500
@@ -5,7 +5,7 @@
 $(PKG)_IGNORE   :=
 $(PKG)_CHECKSUM := 3744a01b45cb8519ba1a5477ab1ce7a16ead889f
 $(PKG)_REMOTE_SUBDIR := 
-$(PKG)_SUBDIR   := 
+$(PKG)_SUBDIR   := io
 $(PKG)_FILE     := io-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := '$(OCTAVE_FORGE_BASE_URL)/$($(PKG)_FILE)/download'
 $(PKG)_DEPS     := 
@@ -16,6 +16,5 @@
 endef
 
 define $(PKG)_BUILD
-    mkdir -p '$(HOST_PREFIX)/src'
-    $(INSTALL) -m644 '$(PKG_DIR)/$($(PKG)_FILE)' '$(HOST_PREFIX)/src'
+    $(OCTAVE_FORGE_PKG_BUILD)
 endef
--- a/src/of-miscellaneous.mk	Sun Dec 01 12:35:03 2013 -0500
+++ b/src/of-miscellaneous.mk	Sun Dec 01 12:38:39 2013 -0500
@@ -5,10 +5,10 @@
 $(PKG)_IGNORE   :=
 $(PKG)_CHECKSUM := eec920357a581f26b2bc9079e32732b77c3a641b
 $(PKG)_REMOTE_SUBDIR := 
-$(PKG)_SUBDIR   := 
+$(PKG)_SUBDIR   := miscellaneous
 $(PKG)_FILE     := miscellaneous-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := '$(OCTAVE_FORGE_BASE_URL)/$($(PKG)_FILE)/download'
-$(PKG)_DEPS     := 
+$(PKG)_DEPS     := of-general
 
 define $(PKG)_UPDATE
     echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
@@ -16,6 +16,5 @@
 endef
 
 define $(PKG)_BUILD
-    mkdir -p '$(HOST_PREFIX)/src'
-    $(INSTALL) -m644 '$(PKG_DIR)/$($(PKG)_FILE)' '$(HOST_PREFIX)/src'
+    $(OCTAVE_FORGE_PKD_BUILD)
 endef
--- a/src/of-optim.mk	Sun Dec 01 12:35:03 2013 -0500
+++ b/src/of-optim.mk	Sun Dec 01 12:38:39 2013 -0500
@@ -17,8 +17,5 @@
 endef
 
 define $(PKG)_BUILD
-    mkdir -p '$(HOST_PREFIX)/src'
-    cd '$(1)/..' \
-      && tar czf $($(PKG)_FIXED_FILE) $($(PKG)_SUBDIR) \
-      && $(INSTALL) -m644 '$($(PKG)_FIXED_FILE)' '$(HOST_PREFIX)/src'
+    $(OCTAVE_FORGE_PKG_BUILD)
 endef
--- a/src/of-signal.mk	Sun Dec 01 12:35:03 2013 -0500
+++ b/src/of-signal.mk	Sun Dec 01 12:38:39 2013 -0500
@@ -5,10 +5,10 @@
 $(PKG)_IGNORE   :=
 $(PKG)_CHECKSUM := 87ed51b878ac49d32c328032500dff452132240b
 $(PKG)_REMOTE_SUBDIR := 
-$(PKG)_SUBDIR   := 
+$(PKG)_SUBDIR   := signal
 $(PKG)_FILE     := signal-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := '$(OCTAVE_FORGE_BASE_URL)/$($(PKG)_FILE)/download'
-$(PKG)_DEPS     := 
+$(PKG)_DEPS     := of-specfun of-control of-general
 
 define $(PKG)_UPDATE
     echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
@@ -16,6 +16,5 @@
 endef
 
 define $(PKG)_BUILD
-    mkdir -p '$(HOST_PREFIX)/src'
-    $(INSTALL) -m644 '$(PKG_DIR)/$($(PKG)_FILE)' '$(HOST_PREFIX)/src'
+    $(OCTAVE_FORGE_PKG_BUILD)
 endef
--- a/src/of-specfun.mk	Sun Dec 01 12:35:03 2013 -0500
+++ b/src/of-specfun.mk	Sun Dec 01 12:38:39 2013 -0500
@@ -5,7 +5,7 @@
 $(PKG)_IGNORE   :=
 $(PKG)_CHECKSUM := 293a98dc2139057aa7119f3065d501616431c6a5
 $(PKG)_REMOTE_SUBDIR := 
-$(PKG)_SUBDIR   := 
+$(PKG)_SUBDIR   := specfun
 $(PKG)_FILE     := specfun-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := '$(OCTAVE_FORGE_BASE_URL)/$($(PKG)_FILE)/download'
 $(PKG)_DEPS     := 
@@ -16,6 +16,5 @@
 endef
 
 define $(PKG)_BUILD
-    mkdir -p '$(HOST_PREFIX)/src'
-    $(INSTALL) -m644 '$(PKG_DIR)/$($(PKG)_FILE)' '$(HOST_PREFIX)/src'
+    $(OCTAVE_FORGE_PKG_BUILD)
 endef
--- a/src/of-statistics.mk	Sun Dec 01 12:35:03 2013 -0500
+++ b/src/of-statistics.mk	Sun Dec 01 12:38:39 2013 -0500
@@ -5,10 +5,10 @@
 $(PKG)_IGNORE   :=
 $(PKG)_CHECKSUM := c8bb88b9da84f5b12e624b65828e58cf16c4e3f4
 $(PKG)_REMOTE_SUBDIR := 
-$(PKG)_SUBDIR   := 
+$(PKG)_SUBDIR   := statistics
 $(PKG)_FILE     := statistics-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := '$(OCTAVE_FORGE_BASE_URL)/$($(PKG)_FILE)/download'
-$(PKG)_DEPS     := 
+$(PKG)_DEPS     := of-io
 
 define $(PKG)_UPDATE
     echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
@@ -16,6 +16,5 @@
 endef
 
 define $(PKG)_BUILD
-    mkdir -p '$(HOST_PREFIX)/src'
-    $(INSTALL) -m644 '$(PKG_DIR)/$($(PKG)_FILE)' '$(HOST_PREFIX)/src'
+    $(OCTAVE_FORGE_PKG_BUILD)
 endef
--- a/src/of-struct.mk	Sun Dec 01 12:35:03 2013 -0500
+++ b/src/of-struct.mk	Sun Dec 01 12:38:39 2013 -0500
@@ -5,7 +5,7 @@
 $(PKG)_IGNORE   :=
 $(PKG)_CHECKSUM := 4703b20612c9e5ec48765af15c28e7a1fc90d427
 $(PKG)_REMOTE_SUBDIR := 
-$(PKG)_SUBDIR   := 
+$(PKG)_SUBDIR   := struct-$($(PKG)_VERSION)
 $(PKG)_FILE     := struct-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := '$(OCTAVE_FORGE_BASE_URL)/$($(PKG)_FILE)/download'
 $(PKG)_DEPS     := 
@@ -16,6 +16,5 @@
 endef
 
 define $(PKG)_BUILD
-    mkdir -p '$(HOST_PREFIX)/src'
-    $(INSTALL) -m644 '$(PKG_DIR)/$($(PKG)_FILE)' '$(HOST_PREFIX)/src'
+    $(OCTAVE_FORGE_PKG_BUILD)
 endef
--- a/src/of-windows.mk	Sun Dec 01 12:35:03 2013 -0500
+++ b/src/of-windows.mk	Sun Dec 01 12:38:39 2013 -0500
@@ -5,7 +5,7 @@
 $(PKG)_IGNORE   :=
 $(PKG)_CHECKSUM := 2270f3d64cf69d030e6825303158c18b9b94a871
 $(PKG)_REMOTE_SUBDIR := 
-$(PKG)_SUBDIR   := 
+$(PKG)_SUBDIR   := Windows
 $(PKG)_FILE     := windows-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := '$(OCTAVE_FORGE_BASE_URL)/$($(PKG)_FILE)/download'
 $(PKG)_DEPS     := 
@@ -16,6 +16,5 @@
 endef
 
 define $(PKG)_BUILD
-    mkdir -p '$(HOST_PREFIX)/src'
-    $(INSTALL) -m644 '$(PKG_DIR)/$($(PKG)_FILE)' '$(HOST_PREFIX)/src'
+    $(OCTAVE_FORGE_PKG_BUILD)
 endef