first shot at distribution and README

diff --git a/ChangeLog b/ChangeLog
index 04376d5..fa9b448 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,9 +6,12 @@ New :
        * Core :
                - Members can be disabled. It deletes volatile datas.                           -MC
        
-       * Install :
+       * Distribution :
                - Do not modify PHP include path from auto.prepend.inc.php                      -SHK
                - Add install.d/apache.conf with a sample Apache config file            -SHK
+               - Add Makefile to generate distribution tarballs                                        -SHK
+               - Generate xorg.config.inc.php using "make"                                                     -SHK
+               - Add a basic README file                                                                                       -SHK
 
        * Mails : Use HermesMailer.                                                                                             -MC
 

diff --git a/Makefile b/Makefile
new file mode 100644 (file)
index 0000000..2399c5d
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,46 @@
+# $Id: Makefile,v 1.1 2004-11-21 20:40:57 x99laine Exp $
+
+# definitions
+
+VERSION := $(shell grep VERSION ChangeLog | head -1 | sed -e "s/VERSION //;s/\t.*//")
+
+PKG_NAME = platal
+PKG_DIST = $(PKG_NAME)-$(VERSION)
+PKG_FILES = AUTHORS ChangeLog COPYING README Makefile
+PKG_DIRS = configs htdocs include install.d plugins po scripts templates upgrade
+
+VCS_FILTER = ! -name .arch-ids ! -name CVS
+
+# global targets
+
+build: pkg-build 
+
+dist: clean pkg-dist
+
+clean:
+       rm -rf locale include/xorg.globals.inc.php
+
+%: %.in Makefile
+       sed -e 's,@VERSION@,$(VERSION),g' $< > $@
+
+
+# diogenes package targets
+
+pkg-build: include/xorg.globals.inc.php
+#      make -C po
+
+pkg-dist: pkg-build
+       rm -rf $(PKG_DIST) $(PKG_DIST).tar.gz
+       mkdir $(PKG_DIST)
+       cp -a $(PKG_FILES) $(PKG_DIST)
+       for dir in `find $(PKG_DIRS) -type d $(VCS_FILTER)`; \
+       do \
+          mkdir -p $(PKG_DIST)/$$dir; \
+         find $$dir -type f -maxdepth 1 -exec cp {} $(PKG_DIST)/$$dir \; ; \
+       done
+       tar czf $(PKG_DIST).tar.gz $(PKG_DIST)
+       rm -rf $(PKG_DIST)
+
+
+.PHONY: build dist clean pkg-build pkg-dist
+

diff --git a/README b/README
new file mode 100644 (file)
index 0000000..0629b24
--- /dev/null
+++ b/README
@@ -0,0 +1,49 @@
+Notes for Platal
+
+PRESENTATION
+------------
+
+This is the source code for the Polytechnique.org site, the almuni site of
+Ecole Polytechnique. This package is a suite of web applications geared
+towards alumni websites.
+
+More information can be found on the Platal project page :
+
+  http://opensource.polytechnique.org/platal/
+
+
+REQUIREMENTS
+------------
+
+First of all you will need a webserver. If you do not currently have a
+webserver, you might consider taking a look at the Apache webserver :
+
+  http://httpd.apache/org/
+
+Platal is written in PHP so you need PHP support for your webserver. You
+can find PHP here :
+
+  http://www.php.net/
+
+Platal makes use of the Smarty template engine which can be found here :
+
+  http://smarty.php.net/
+
+Platal also makes heavy use of the Diogenes library, libdiogenes which lives
+here :
+
+  http://opensource.polytechnique.org/libdiogenes/
+
+You will need to have access to a MySQL server. If you do not currently have a
+MySQL server running, you can download it here :
+
+  http://www.mysql.com/
+
+
+BUILDING
+--------
+
+To build Platal, simply run "make" from the toplevel directory.
+
+
+$ Id: README,v 1.4 2004/05/27 09:54:01 x99laine Exp $

diff --git a/include/xorg.globals.inc.php b/include/xorg.globals.inc.php.in
similarity index 93%
rename from include/xorg.globals.inc.php
rename to include/xorg.globals.inc.php.in
index 3d969fe..6c43218 100644 (file)
--- a/include/xorg.globals.inc.php
+++ b/include/xorg.globals.inc.php.in
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: xorg.globals.inc.php,v 1.6 2004-11-18 14:24:02 x2000habouzit Exp $
+        $Id: xorg.globals.inc.php.in,v 1.1 2004-11-21 20:40:57 x99laine Exp $
  ***************************************************************************/
 
 require("diogenes.core.globals.inc.php");
@@ -27,6 +27,9 @@ class XorgGlobals extends DiogenesCoreGlobals {
     var $page = 'XorgPage';
     var $session = 'XorgSession';
 
+    /** The x.org version */
+    var $version = "@VERSION@";
+
     var $dbdb = 'x4dat';
     var $table_auth = 'auth_user_md5';
     var $table_log_actions = 'logger.actions';