Mercurial > mxe-octave

changeset 2964:1955438b24dc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
get notepad++
author John W. Eaton <jwe@octave.org>
date Thu, 24 Jan 2013 17:33:34 -0500
parents b804e33fe984
children d35eda9fb1f3
files Makefile index.html mk-dist
diffstat 3 files changed, 13 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Mon Jan 14 17:50:51 2013 -0500
+++ b/Makefile	Thu Jan 24 17:33:34 2013 -0500
@@ -57,6 +57,8 @@
 MSYS_BASE_DIR := $(PREFIX)/../msys-base
 MSYS_BASE_PACKAGES := $(addprefix msys-,bash coreutils diffutils file findutils gawk grep gzip less libiconv libintl libmagic make msys-core regex sed tar termcap)
 
+NOTEPAD_BASE_DIR := $(PREFIX)/../notepad++
+
 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)
 
--- a/index.html	Mon Jan 14 17:50:51 2013 -0500
+++ b/index.html	Thu Jan 24 17:33:34 2013 -0500
@@ -1764,6 +1764,11 @@
         <td id="nsis-website"><a href="http://nsis.sourceforge.net/">NSIS</a></td>
     </tr>
     <tr>
+        <td id="npp-package">nsis</td>
+        <td id="npp-version">6.2.3</td>
+        <td id="npp-website"><a href="http://notepad-plus-plus.org">Notepad++</a></td>
+    </tr>
+    <tr>
         <td id="ocaml-native-package">ocaml</td>
         <td id="ocaml-native-version">4.00.0</td>
         <td id="ocaml-native-website"><a href="http://caml.inria.fr/">ocaml</a></td>
--- a/mk-dist	Mon Jan 14 17:50:51 2013 -0500
+++ b/mk-dist	Thu Jan 24 17:33:34 2013 -0500
@@ -42,7 +42,7 @@
 mkdir -p $OCTAVE_DIST_DIR
 
 echo "building octave and dependencies..."
-make $OCTAVE_TARGET msys-base native-gcc native-binutils octave-forge-packages JOBS=$jobs
+make $OCTAVE_TARGET msys-base native-gcc native-binutils octave-forge-packages npp JOBS=$jobs
 
 echo "generating lists of files to exclude..."
 
@@ -75,6 +75,11 @@
 cd $TOPDIR/msys-base
 tar -c -h -f - . | ( cd $OCTAVE_DIST_DIR ; tar xpf - )
 
+echo "  notepad++..."
+cd $TOPDIR
+tar -c -h -f - notepad++ | ( cd $OCTAVE_DIST_DIR ; tar xpf - )
+cp $TOPDIR/build_packages.m $OCTAVE_DIST_DIR/src
+
 echo "making all files writable by user..."
 chmod -R u+w $OCTAVE_DIST_DIR