Mercurial > octave-nkf
changeset 14297:05a262b7f42e gui
Removed scripts to retrieved qterminal and qirc. Instead used .hgsub.
* compile.sh: Removed lines to retrieve qterminal and qirc.
* get-qirc.sh: Removed.
* get-qterminal.sh: Removed.
* octave-gui.pro: Added system calls to build qterminal and qirc.
| author | Jacob Dawid <jacob.dawid@googlemail.com> |
|---|---|
| date | Tue, 31 Jan 2012 21:00:54 +0100 |
| parents | c39c7f2b1e46 |
| children | 3552c0ae59c4 |
| files | gui/.hgsub gui/compile.sh gui/get-qirc.sh gui/get-qterminal.sh gui/octave-gui.pro |
| diffstat | 5 files changed, 7 insertions(+), 80 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gui/.hgsub Tue Jan 31 21:00:54 2012 +0100 @@ -0,0 +1,2 @@ +qterminal = [git]https://code.google.com/p/qterminal/ +qirc = [git]https://code.google.com/p/qirc
--- a/gui/compile.sh Tue Jan 31 02:12:56 2012 +0100 +++ b/gui/compile.sh Tue Jan 31 21:00:54 2012 +0100 @@ -17,7 +17,5 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -./get-qterminal.sh -./get-qirc.sh qmake-qt4 octave-gui.pro make
--- a/gui/get-qirc.sh Tue Jan 31 02:12:56 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +0,0 @@ -#!/bin/bash - -# OctaveGUI - A graphical user interface for Octave -# Copyright (C) 2011 Jacob Dawid (jacob.dawid@googlemail.com) -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# - -qirc_dir="qirc"; -echo "Updating qirc.."; - -# Check whether we have already cloned the repository: -if [ -d $qirc_dir ]; then - # Yes, so just pull any changes and rebuild. - cd qirc - git pull - qmake-qt4 qirc.pro - cd .. -else - # No, clone the repository, checkout the stable branch - # and build it. - git clone https://code.google.com/p/qirc/ - git checkout master - cd qirc - qmake-qt4 qirc.pro - make - cd .. -fi
--- a/gui/get-qterminal.sh Tue Jan 31 02:12:56 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +0,0 @@ -#!/bin/bash - -# OctaveGUI - A graphical user interface for Octave -# Copyright (C) 2011 Jacob Dawid (jacob.dawid@googlemail.com) -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# - -qterminal_dir="qterminal"; -echo "Updating qterminal.."; - -# Check whether we have already cloned the repository: -if [ -d $qterminal_dir ]; then - # Yes, so just pull any changes and rebuild. - cd qterminal - git pull - qmake-qt4 qterminal.pro - cd .. -else - # No, clone the repository, checkout the stable branch - # and build it. - git clone https://code.google.com/p/qterminal/ - git checkout master - cd qterminal - qmake-qt4 qterminal.pro - make - cd .. -fi
--- a/gui/octave-gui.pro Tue Jan 31 02:12:56 2012 +0100 +++ b/gui/octave-gui.pro Tue Jan 31 21:00:54 2012 +0100 @@ -39,6 +39,11 @@ CONFIG -= app_bundle } +system(qirc/qmake) +system(qirc/make) +system(qterminal/qmake) +system(qterminal/make) + # Includepaths and libraries to link against: INCLUDEPATH += src src/backend qterminal/libqterminal qirc/libqirc \ $$system(mkoctfile -p INCFLAGS)