Re-implement rhe "bindist" Makefile target

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@841 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index 74e3a757a3495de9acfe617aa09822b43aa50971..2cbca03ac224991f84905809a0b33c06f46e6dfc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-06-27  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * Makefile.am (bindist): new target.
+
+       * INSTALL: add instructions for doing a binary distribution.
+
+       * development/tools/README.bin.example: update a bit. 
+
 2000-06-26  Lior Silberman <slior@math.huji.ac.il>
 
        * src/lyxrc.C: 

diff --git a/INSTALL b/INSTALL
index cc40f6085dfcb4b74deb585e77bdd13f1222c91f..2a89c4b01a3d5136229e848a1025503384e8c5ee 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -251,17 +251,34 @@ the source code directory.  After you have installed LyX for one
 architecture, use `make distclean' before reconfiguring for another
 architecture.
 
-Stripping LyX
--------------
+Preparing a binary distribution for the use of others
+------------------------------------------------------
 
-A LyX binary for linux is about 1M when compiled without debug-information 
-and with dynamic libraries.  If yours is much bigger you probably compiled 
-it with debug-informations (-g).  If you don't want to debug LyX just enter
+  o Compile LyX with the right compiler switches for your
+    architecture. In particular you might want to ensure that
+    libraries like xforms and xpm are statically linked. To this end,
+    you can use a command like
 
-          strip src/lyx
+                make LYX_LIBS='/foo/libforms.a /bar/libXpm.a'
 
-before installing.  Note that this is done automatically for public
-versions.
+    Moreover, make sure you use the --without-latex-config switch
+    of configure, since others might not be interested by your
+   configuration :-) 
+
+  o Create a file README.bin describing your distribution and
+    referring to *you* if problems arise. As a model, you can use the 
+    file development/tools/README.bin.example, which can be a good
+    starting point. 
+
+  o Type `make bindist'. This will create a file
+    lyx-1.xx.yy-bin.tar.gz. Rename it to reflect you architecture 
+    and the peculiarities of your build (e.g. static vs. dynamic).
+
+  o Check that everything is correct by unpacking the distribution 
+    in some private place and running it. In particular, check the 
+    output of `ldd lyx' to know which libraries are really needed.
+
+  o Upload your binary file to ftp.lyx.org:/pub/lyx/uploads.
 
 
 Problems

diff --git a/Makefile.am b/Makefile.am
index 698ec378d281f8805e2e0993721238f2173ce7d8..125588285c6c96cd41a5df6ed1638e6fbfe8e3b3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,6 +10,11 @@ EXTRA_DIST = ANNOUNCE OLD-CHANGES INSTALL.OS2 INSTALL.autoconf README.OS2 \
        config development forms images
 ETAGS_ARGS = --lang=c++
 man_MANS = lyx.1
+
+## Needed by bindist
+bindistdir=lyxbin
+bindistfile=$(PACKAGE)-$(VERSION)-bin.tar.gz
+
 lyx.1:
        cp -p $(srcdir)/lyx.man lyx.1
 
@@ -24,3 +29,23 @@ rpmdist: dist
        rpm -ta ${PACKAGE}-${VERSION}.tar.gz ; \
        rm lyx.xpm
 
+
+bindist:
+       mkdir $(bindistdir)
+       if test -f README.bin ; then \
+         $(INSTALL) README.bin  $(bindistdir)/README.bin ; \
+       fi 
+       $(MAKE) $(AM_MAKEFLAGS) install-strip prefix=`pwd`/$(bindistdir)
+       (cd $(bindistdir) ; tar cf - .) | gzip >$(bindistfile)
+       rm -rf $(bindistdir)
+       @if test -f README.bin ; then \
+         echo "*** Did you remember to check the contents of README.bin?" ; \
+       else \
+         echo "*** WARNING: You did not provide a README.bin file." ; \
+         echo "*** Please make one now from the example file" ; \
+         echo "***   development/tools/README.bin.example" ; \
+       fi  
+       @echo "*** It should mention any problem concerning your binary"
+       @echo "*** distribution and refer to *you* in case of problem."
+       @echo "*** $(bindistfile) has been created."
+

diff --git a/development/tools/README.bin.example b/development/tools/README.bin.example
index 25e4e6d69b489fd313091e52dbe369172e9bb511..82d4210602a7109069e1e69ded0c58fc61537949 100644 (file)
--- a/development/tools/README.bin.example
+++ b/development/tools/README.bin.example
@@ -1,4 +1,4 @@
-README file for the binary distribution of LyX 1.0.2
+README file for the binary distribution of LyX 1.1.5
 ======================================================
 
 Please read the file README for general information on LyX.

diff --git a/po/POTFILES.in b/po/POTFILES.in
index b80c5a8da6a1dbe19107216b783712ecf189d476..e7da1a54f5119452041a298eb8cb0b8f3aa057a9 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -50,6 +50,7 @@ src/insets/insetlabel.C
 src/insets/insetloa.C
 src/insets/insetlof.C
 src/insets/insetlot.C
+src/insets/insetmarginal.C
 src/insets/insetparent.C
 src/insets/insetref.C
 src/insets/insettabular.C