X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=README.Git;h=d8e31afed41c6bbc5ed4380b65626734ae0ff457;hb=9c4f9645b4f0b99ebca6a7a25b81dafd358a7f7a;hp=b9ed2222fca9d9639bd697296acfe40e3c6a32e2;hpb=0df9cdd3df66caf4353128feff3008289cda8115;p=pspp

diff --git a/README.Git b/README.Git
index b9ed2222fc..d8e31afed4 100644
--- a/README.Git
+++ b/README.Git
@@ -21,7 +21,7 @@ following:
 
 	* libtool 1.5.22 (or later).
 
-	* Texinfo 4.7 or later, to build the documentation.
+	* Texinfo 5.2 or later, to build the documentation.
 
 	* Gimp --  2.8.2 is known to work
 
@@ -36,14 +36,14 @@ This version of PSPP should work with the Gnulib commit shown below.
 Gnulib does not maintain a stable API or ABI, so it is possible that
 PSPP will not work with older or newer versions of Gnulib.
 
-	commit c5c4f53b31f1ad04f4033a6124120ffec9257847
-	Author: Pádraig Brady <P@draigBrady.com>
-	Date:   Sat Dec 6 01:14:02 2014 +0000
+	commit 6ccfbb4ce5d4fa79f7afb48f3648f2e0401523c3
+	Author: Paul Eggert <eggert@cs.ucla.edu>
+	Date:   Sat Nov 3 23:31:33 2018 -0700
 
-	    vasnprintf: fix potential use after free
+	    parse-datetime: simplify test for mktime failure
 
-	    * lib/vasnprintf.c (VASNPRINTF): Fix free-memory read,
-	    flagged by clang-analyzer 3.4.2.
+	    * lib/parse-datetime.y (mktime_ok): Simplify.
+	    Remove args TZ and T; no longer needed.  Callers changed.
 
 To clone Gnulib into a directory named "gnulib" using Git, and then
 check out this particular commit, run these commands:
@@ -79,3 +79,58 @@ Once PSPP is built, you may run its self-tests with:
 	make check
 or for a more thorough test:
 	make distcheck
+
+Glade UI Design
+---------------
+
+The ui files in src/ui/gui may be viewed (maybe changed) with Glade. For this
+you need
+
+	* libgladeui 2.0 or later
+
+Then you need to run
+
+        configure --with-gui-tools
+	make
+	make install
+
+psppire uses some self defined widgets. To use glade these widgets have
+to be announced to glade such that you can view the interface.
+The install process will install the psppire glade library, icons and
+psppire.xml files in the appropriate system locations. You cannot override
+this with --prefix. After that you can run "glade" and open the ui files.
+
+Building from git on Mac OS
+---------------------------
+
+You can build on MacOS in the macports environment. After installing all
+required packages to resolve library dependencies and autotools e.t.c, you
+run make -f Smake as described above.
+
+The macports system provides the libraries and header files in a separate
+location from the MacOS system libraries. The typical locations are
+
+Libraries: /opt/local/lib
+Headers:   /opt/local/include
+
+pspp under macports will be linked against the macports libraries. The configure
+script has to be informed about the library and header locations. Assume the following
+directory structure for an out of tree build:
+
+~/mypspp
+  |----pspp    (This is the pspp git directory)
+  |----install (The install location containing also ui files for psppire)
+  |----build   (The build directory)
+  |----gnulib  (The gnulib directory as described above)
+
+Then you can build with the following commands:
+
+    cd ~/mypspp/pspp
+    make -f Smake
+    cd ../build
+    ../pspp/configure --prefix=/Users/USER/mypspp/install \
+                  LDFLAGS=-L/opt/local/lib \
+		  CPPFLAGS=-I/opt/local/include
+    make
+    make install
+    ../install/bin/psppire (If everything worked, you should see psppire...)