gnue-appserver ./setup.py samples/Makefile samp...

[Reinhard Mueller]

CVSROOT:        /cvsroot/gnue
Module name:    gnue-appserver
Branch:         
Changes by:     Reinhard Mueller <address@hidden>       03/09/19 14:29:43

Modified files:
        .              : setup.py 
        samples        : Makefile README setup-mysql.sh setup-pgsql.sh 

Log message:
        Move SQL-scripts into root samples directory.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-appserver/setup.py.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-appserver/samples/Makefile.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-appserver/samples/README.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-appserver/samples/setup-mysql.sh.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-appserver/samples/setup-pgsql.sh.diff?tr1=1.10&tr2=1.11&r1=text&r2=text

Patches:
Index: gnue-appserver/samples/Makefile
diff -c gnue-appserver/samples/Makefile:1.7 gnue-appserver/samples/Makefile:1.8
*** gnue-appserver/samples/Makefile:1.7 Tue Sep 16 15:00:15 2003
--- gnue-appserver/samples/Makefile     Fri Sep 19 14:29:43 2003
***************
*** 10,52 ****
  out2 = auth
  out3 = sample
  
! all:  pgsql mysql mssql sybase interbase html
  
  
! mysql:
        mkdir -p mysql
        ${xsltcmd} ${xslpath}mysql.xsl ${src1} | ${xsltcmd} ${xslstrip} > 
mysql/${out1}.sql
        ${xsltcmd} ${xslpath}mysql.xsl ${src2} | ${xsltcmd} ${xslstrip} > 
mysql/${out2}.sql
        ${xsltcmd} ${xslpath}mysql.xsl ${src3} | ${xsltcmd} ${xslstrip} > 
mysql/${out3}.sql
!       cat mysql/${out1}.sql mysql/${out2}.sql mysql/${out3}.sql > 
mysql/full.sql 
  
! pgsql:
        mkdir -p pgsql
        ${xsltcmd} ${xslpath}pgsql.xsl ${src1} | ${xsltcmd} ${xslstrip} > 
pgsql/${out1}.sql
        ${xsltcmd} ${xslpath}pgsql.xsl ${src2} | ${xsltcmd} ${xslstrip} > 
pgsql/${out2}.sql
        ${xsltcmd} ${xslpath}pgsql.xsl ${src3} | ${xsltcmd} ${xslstrip} > 
pgsql/${out3}.sql
!       cat pgsql/${out1}.sql pgsql/${out2}.sql pgsql/${out3}.sql > 
pgsql/full.sql 
  
! mssql:
        mkdir -p mssql
        ${xsltcmd} ${xslpath}mssql.xsl ${src1} | ${xsltcmd} ${xslstrip} > 
mssql/${out1}.sql
        ${xsltcmd} ${xslpath}mssql.xsl ${src2} | ${xsltcmd} ${xslstrip} > 
mssql/${out2}.sql
        ${xsltcmd} ${xslpath}mssql.xsl ${src3} | ${xsltcmd} ${xslstrip} > 
mssql/${out3}.sql
!       cat mssql/${out1}.sql mssql/${out2}.sql mssql/${out3}.sql > 
mssql/full.sql 
  
! sybase:
        mkdir -p sybase
        ${xsltcmd} ${xslpath}sybase.xsl ${src1} | ${xsltcmd} ${xslstrip} > 
sybase/${out1}.sql
        ${xsltcmd} ${xslpath}sybase.xsl ${src2} | ${xsltcmd} ${xslstrip} > 
sybase/${out2}.sql
        ${xsltcmd} ${xslpath}sybase.xsl ${src3} | ${xsltcmd} ${xslstrip} > 
sybase/${out3}.sql
!       cat sybase/${out1}.sql sybase/${out2}.sql sybase/${out3}.sql > 
sybase/full.sql 
  
! interbase:
        mkdir -p interbase
        ${xsltcmd} ${xslpath}interbase.xsl ${src1} | ${xsltcmd} ${xslstrip} > 
interbase/${out1}.sql
        ${xsltcmd} ${xslpath}interbase.xsl ${src2} | ${xsltcmd} ${xslstrip} > 
interbase/${out2}.sql
        ${xsltcmd} ${xslpath}interbase.xsl ${src3} | ${xsltcmd} ${xslstrip} > 
interbase/${out3}.sql
!       cat interbase/${out1}.sql interbase/${out2}.sql interbase/${out3}.sql > 
interbase/full.sql 
  
  html:
        mkdir -p html
--- 10,52 ----
  out2 = auth
  out3 = sample
  
! all:  pgsql.sql mysql.sql mssql.sql sybase.sql interbase.sql html
  
  
! mysql.sql:
        mkdir -p mysql
        ${xsltcmd} ${xslpath}mysql.xsl ${src1} | ${xsltcmd} ${xslstrip} > 
mysql/${out1}.sql
        ${xsltcmd} ${xslpath}mysql.xsl ${src2} | ${xsltcmd} ${xslstrip} > 
mysql/${out2}.sql
        ${xsltcmd} ${xslpath}mysql.xsl ${src3} | ${xsltcmd} ${xslstrip} > 
mysql/${out3}.sql
!       cat mysql/${out1}.sql mysql/${out2}.sql mysql/${out3}.sql > mysql.sql 
  
! pgsql.sql:
        mkdir -p pgsql
        ${xsltcmd} ${xslpath}pgsql.xsl ${src1} | ${xsltcmd} ${xslstrip} > 
pgsql/${out1}.sql
        ${xsltcmd} ${xslpath}pgsql.xsl ${src2} | ${xsltcmd} ${xslstrip} > 
pgsql/${out2}.sql
        ${xsltcmd} ${xslpath}pgsql.xsl ${src3} | ${xsltcmd} ${xslstrip} > 
pgsql/${out3}.sql
!       cat pgsql/${out1}.sql pgsql/${out2}.sql pgsql/${out3}.sql > pgsql.sql 
  
! mssql.sql:
        mkdir -p mssql
        ${xsltcmd} ${xslpath}mssql.xsl ${src1} | ${xsltcmd} ${xslstrip} > 
mssql/${out1}.sql
        ${xsltcmd} ${xslpath}mssql.xsl ${src2} | ${xsltcmd} ${xslstrip} > 
mssql/${out2}.sql
        ${xsltcmd} ${xslpath}mssql.xsl ${src3} | ${xsltcmd} ${xslstrip} > 
mssql/${out3}.sql
!       cat mssql/${out1}.sql mssql/${out2}.sql mssql/${out3}.sql > mssql.sql 
  
! sybase.sql:
        mkdir -p sybase
        ${xsltcmd} ${xslpath}sybase.xsl ${src1} | ${xsltcmd} ${xslstrip} > 
sybase/${out1}.sql
        ${xsltcmd} ${xslpath}sybase.xsl ${src2} | ${xsltcmd} ${xslstrip} > 
sybase/${out2}.sql
        ${xsltcmd} ${xslpath}sybase.xsl ${src3} | ${xsltcmd} ${xslstrip} > 
sybase/${out3}.sql
!       cat sybase/${out1}.sql sybase/${out2}.sql sybase/${out3}.sql > 
sybase.sql 
  
! interbase.sql:
        mkdir -p interbase
        ${xsltcmd} ${xslpath}interbase.xsl ${src1} | ${xsltcmd} ${xslstrip} > 
interbase/${out1}.sql
        ${xsltcmd} ${xslpath}interbase.xsl ${src2} | ${xsltcmd} ${xslstrip} > 
interbase/${out2}.sql
        ${xsltcmd} ${xslpath}interbase.xsl ${src3} | ${xsltcmd} ${xslstrip} > 
interbase/${out3}.sql
!       cat interbase/${out1}.sql interbase/${out2}.sql interbase/${out3}.sql > 
interbase.sql 
  
  html:
        mkdir -p html
***************
*** 57,60 ****
        ln ${xslpath}/yes.png html
  
  clean:
!       rm -rf mysql pgsql mssql sybase interbase html
--- 57,60 ----
        ln ${xslpath}/yes.png html
  
  clean:
!       rm -rf *.sql mysql pgsql mssql sybase interbase html
Index: gnue-appserver/samples/README
diff -c gnue-appserver/samples/README:1.2 gnue-appserver/samples/README:1.3
*** gnue-appserver/samples/README:1.2   Fri Sep 19 03:06:11 2003
--- gnue-appserver/samples/README       Fri Sep 19 14:29:43 2003
***************
*** 11,20 ****
  Before you can start gnue-appserver, you have to create a database and fill it
  with some basic information.
  
! For Interbase, MS SQL, MySQL, PostgreSQL, and Sybase, there are subdirectories
! containing a SQL script called "full.sql".  On your database server, create a
! user "gnue", a database "gnue" where the user "gnue" has full access, and run
! the correct "full.sql" script against that database.
  
  For PostgreSQL and MySQL, there are the shell scripts "setup-pgsql.sh" and
  "setup-mysql.sh" respectively, that do exactly that.  Contributed shell 
scripts
--- 11,20 ----
  Before you can start gnue-appserver, you have to create a database and fill it
  with some basic information.
  
! For Interbase, MS SQL, MySQL, PostgreSQL, and Sybase, you can find SQL scripts
! here in this directory.  On your database server, create a user "gnue", a
! database "gnue" where the user "gnue" has full access, and run the correct SQL
! script against that database.
  
  For PostgreSQL and MySQL, there are the shell scripts "setup-pgsql.sh" and
  "setup-mysql.sh" respectively, that do exactly that.  Contributed shell 
scripts
***************
*** 36,43 ****
  "gnue-forms sample.gfd".  Please refer to gnue-forms's documentation for more
  details.
  
  Other Samples
! -------------
  
  Apart from the basic "sample.gfd" you will find the following other samples 
in this directory:
  
--- 36,44 ----
  "gnue-forms sample.gfd".  Please refer to gnue-forms's documentation for more
  details.
  
+ 
  Other Samples
! =============
  
  Apart from the basic "sample.gfd" you will find the following other samples 
in this directory:
  
Index: gnue-appserver/samples/setup-mysql.sh
diff -c gnue-appserver/samples/setup-mysql.sh:1.2 
gnue-appserver/samples/setup-mysql.sh:1.3
*** gnue-appserver/samples/setup-mysql.sh:1.2   Wed Sep 10 15:09:30 2003
--- gnue-appserver/samples/setup-mysql.sh       Fri Sep 19 14:29:43 2003
***************
*** 2,11 ****
  # Set up sample database for MySQL
  # The current user must have permission to create databases
  
! if [ ! -f pgsql/full.sql ]; then
!   make mysql
  fi
  
  echo "create database gnue;" | mysql -p
  
! mysql -p < mysql/full.sql
--- 2,11 ----
  # Set up sample database for MySQL
  # The current user must have permission to create databases
  
! if [ ! -f mysql.sql ]; then
!   make mysql.sql
  fi
  
  echo "create database gnue;" | mysql -p
  
! mysql -p < mysql.sql
Index: gnue-appserver/samples/setup-pgsql.sh
diff -c gnue-appserver/samples/setup-pgsql.sh:1.10 
gnue-appserver/samples/setup-pgsql.sh:1.11
*** gnue-appserver/samples/setup-pgsql.sh:1.10  Wed Sep 10 15:09:30 2003
--- gnue-appserver/samples/setup-pgsql.sh       Fri Sep 19 14:29:43 2003
***************
*** 2,11 ****
  # Set up sample database for PostgreSQL
  # The current user must have permission to create databases
  
! if [ ! -f pgsql/full.sql ]; then
!   make pgsql
  fi
  
  createuser --createdb --adduser gnue
  createdb gnue
! psql gnue < pgsql/full.sql
--- 2,11 ----
  # Set up sample database for PostgreSQL
  # The current user must have permission to create databases
  
! if [ ! -f pgsql.sql ]; then
!   make pgsql.sql
  fi
  
  createuser --createdb --adduser gnue
  createdb gnue
! psql gnue < pgsql.sql
Index: gnue-appserver/setup.py
diff -c gnue-appserver/setup.py:1.18 gnue-appserver/setup.py:1.19
*** gnue-appserver/setup.py:1.18        Fri Sep 19 10:23:21 2003
--- gnue-appserver/setup.py     Fri Sep 19 14:29:43 2003
***************
*** 21,27 ****
  # write to the Free Software Foundation, Inc., 59 Temple Place
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: setup.py,v 1.18 2003/09/19 14:23:21 reinhard Exp $
  
  import sys
  import string
--- 21,27 ----
  # write to the Free Software Foundation, Inc., 59 Temple Place
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: setup.py,v 1.19 2003/09/19 18:29:43 reinhard Exp $
  
  import sys
  import string
***************
*** 324,337 ****
  # Call the actual setup routine
  # 
-----------------------------------------------------------------------------
  
  docfiles = ["AUTHORS", "COPYING", "INSTALL", "NEWS", "README", "ROADMAP",
              "THANKS", "TODO", "doc/api/api.txt",
              "doc/whitepaper/whitepaper.txt"]
  
! manfiles = ["man/gnue-appserver.1"]
  
! samplefiles = ["samples/sample.gfd", "samples/setup-pgsql.sh",
!                "samples/setup-mysql.sh"]
  
  setup (name = "GNUe-AppServer",
         version = VERSION + suffix,
--- 324,343 ----
  # Call the actual setup routine
  # 
-----------------------------------------------------------------------------
  
+ manfiles = ["man/gnue-appserver.1"]
+ 
  docfiles = ["AUTHORS", "COPYING", "INSTALL", "NEWS", "README", "ROADMAP",
              "THANKS", "TODO", "doc/api/api.txt",
              "doc/whitepaper/whitepaper.txt"]
  
! samplefiles = ["samples/sample.gfd", "samples/GNUe_ClassRepository.gfd",
!                "samples/interbase.sql", "samples/mssql.sql",
!                "samples/mysql.sql", "samples/pgsql.sql", "samples/sybase.sql",
!                "samples/setup-mysql.sh", "samples/setup-pgsql.sh"]
! 
! grpcfiles = ["grpc/appserver.grpc"]
  
! datafiles = ["src/classrep/repository.ini"]
  
  setup (name = "GNUe-AppServer",
         version = VERSION + suffix,
***************
*** 345,361 ****
         # Override certain command classes with our own ones
         cmdclass = {"install": my_install},
  
!        data_files = [ ("doc/appserver", docfiles),
!                       ("man/man1", manfiles),
!                       ("samples/appserver", samplefiles),
!                       ("samples/appserver/interbase",
!                                                
["samples/interbase/full.sql"]),
!                       ("samples/appserver/mssql", ["samples/mssql/full.sql"]),
!                       ("samples/appserver/mysql", ["samples/mysql/full.sql"]),
!                       ("samples/appserver/pgsql", ["samples/pgsql/full.sql"]),
!                       ("samples/appserver/sybase", 
["samples/sybase/full.sql"]),
!                       ("shared/grpc", ["grpc/appserver.grpc"]),
!                       ("share/gnue-appserver", 
["src/classrep/repository.ini"])
                         ],
  
         packages = ["gnue.appserver",
--- 351,361 ----
         # Override certain command classes with our own ones
         cmdclass = {"install": my_install},
  
!        data_files = [ ("share/man/man1",                   manfiles),
!                       ("share/doc/gnue-appserver",         docfiles),
!                       ("share/doc/gnue-appserver/samples", samplefiles),
!                       ("shared/grpc",                      grpcfiles),
!                       ("share/gnue-appserver",             datafiles)
                         ],
  
         packages = ["gnue.appserver",