Ignore:
Timestamp:
12/10/14 18:46:19 (6 years ago)
Author:
Jeremy Symon
Message:

Lots of changes to get edit mode working. Changed variable marker to %var% instead of @var@ in order to differentiate from greenstone build variables, which allows variables to be used in patch files now. Added wget dependency. Enabled cgi scripts. Added patches to set correct settings in global.properties, gsdl3site.cfg.

Location:
main/trunk/package-kits/linux
Files:
3 added
1 deleted
19 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/package-kits/linux/distros/arch

    r29546 r29577  
    44SYSTEMSHARE:            /usr/share
    55SYSTEMBIN:              /usr/bin
    6 SYSTEMJAVA:             @SYSTEMLIB@/jvm/default
    7 GREENSTONE_HOME:        @SYSTEMSHARE@/greenstone
    8 WEB:                    @GREENSTONE_HOME@/web
     6SYSTEMJAVA:             %SYSTEMLIB%/jvm/default
     7GREENSTONE_HOME:        %SYSTEMSHARE%/greenstone
     8WEB:                    %GREENSTONE_HOME%/web
    99TOMCATLIB:              /usr/share/java/tomcat7
    1010TOMCATCONF:             /etc/tomcat7/Catalina/localhost
    1111TOMCAT_USER:            tomcat7
    12 GSTOOLS:                @GREENSTONE_HOME@/tools
    13 GLI:                    @GREENSTONE_HOME@/gli
     12GLI:                    %GREENSTONE_HOME%/gli
    1413
    1514PKG_SVN:
     
    4241PKG_RSYNC:
    4342    rsync
     43PKG_WGET:
     44    wget
  • main/trunk/package-kits/linux/distros/fedora

    r29559 r29577  
    55SYSTEMBIN:              /usr/bin
    66SYSTEMJAVA:             /etc/alternatives/java_sdk
    7 GREENSTONE_HOME:        @SYSTEMSHARE@/greenstone
    8 WEB:                    @GREENSTONE_HOME@/web
     7GREENSTONE_HOME:        %SYSTEMSHARE%/greenstone
     8WEB:                    %GREENSTONE_HOME%/web
    99TOMCATLIB:              /usr/share/tomcat/lib
    1010TOMCATCONF:             /etc/tomcat/Catalina/localhost
    1111TOMCAT_USER:            tomcat
    12 GSTOOLS:                @GREENSTONE_HOME@/tools
    13 GLI:                    @GREENSTONE_HOME@/gli
     12GLI:                    %GREENSTONE_HOME%/gli
    1413
    1514PKG_SVN:
     
    4140PKG_RSYNC:
    4241    rsync
     42PKG_WGET:
     43    wget
  • main/trunk/package-kits/linux/distros/ubuntu

    r29546 r29577  
    44SYSTEMSHARE:            /usr/share
    55SYSTEMBIN:              /usr/bin
    6 SYSTEMJAVA:             @SYSTEMLIB@/jvm/default-java
    7 GREENSTONE_HOME:        @SYSTEMSHARE@/greenstone
    8 WEB:                    @GREENSTONE_HOME@/web
     6SYSTEMJAVA:             %SYSTEMLIB%/jvm/default-java
     7GREENSTONE_HOME:        %SYSTEMSHARE%/greenstone
     8WEB:                    %GREENSTONE_HOME%/web
    99TOMCATLIB:              /usr/share/tomcat7/lib
    1010TOMCATCONF:             /etc/tomcat7/Catalina/localhost
    1111TOMCAT_USER:            tomcat7
    12 GSTOOLS:                @GREENSTONE_HOME@/tools
    13 GLI:                    @GREENSTONE_HOME@/gli
     12GLI:                    %GREENSTONE_HOME%/gli
    1413
    1514PKG_SVN:
     
    4039PKG_RSYNC:
    4140    rsync
     41PKG_WGET:
     42    wget
  • main/trunk/package-kits/linux/files/greenstone

    r29546 r29577  
    3434fi
    3535
    36 GSDLHOME=@GSTOOLS@/gs2build
     36GSDLHOME=%GREENSTONE_HOME%/gs2build
    3737export GSDLHOME
    3838
     
    7575PATH="$GSDLHOME/bin/script:$GSDLHOME/bin/$GSDLOS$GSDLARCH:$PATH"
    7676export PATH
    77 LD_LIBRARY_PATH="$GSDLHOME/gs2build/lib/$GSDLOS$GSDLARCH:$GSDLHOME/lib/$GSDLOS$GSDLARCH:$LD_LIBRARY_PATH"
     77LD_LIBRARY_PATH="$GSDLHOME/lib/$GSDLOS$GSDLARCH:$LD_LIBRARY_PATH"
    7878export LD_LIBRARY_PATH
    7979
    8080if test -n "$interactive" -a -z "$GSDL3HOME" ; then
    81     echo "Where are the collections? [/srv/gsdl/]" >&2
     81    echo "Where are the collections? [%WEB%]" >&2
    8282    echo -n " > " >&2
    8383    read GSDL3HOME
     
    8585if test -z "$GSDL3HOME" ; then
    8686    echo "Setting collections location to the default" >&2
    87     GSDL3HOME=@WEB@
     87    GSDL3HOME=%WEB%
    8888fi
    8989export GSDL3HOME
  • main/trunk/package-kits/linux/files/greenstone3.xml

    r29546 r29577  
    1 <Context path="/greenstone3" docBase="@WEB@" reloadable="true">
     1<Context path="/greenstone3"
     2         docBase="%WEB%"
     3         reloadable="true"
     4         privileged="true">
    25    <Realm className="org.apache.catalina.realm.JDBCRealm"
    3         driverName="org.apache.derby.jdbc.EmbeddedDriver"
    4         connectionURL="jdbc:derby:@WEB@/etc/usersDB"
    5         userTable="users" userNameCol="username" userCredCol="password"
    6         userRoleTable="roles" roleNameCol="role"
     6           driverName="org.apache.derby.jdbc.EmbeddedDriver"
     7           connectionURL="jdbc:derby:%WEB%/etc/usersDB"
     8           userTable="users"
     9           userNameCol="username"
     10           userCredCol="password"
     11           userRoleTable="roles"
     12           roleNameCol="role"
    713    />
    814</Context>
  • main/trunk/package-kits/linux/managers/apt/debian/changelog

    r29511 r29577  
    1 @NAME@ (@VERSION@) unstable; urgency=medium
     1%NAME% (%VERSION%) unstable; urgency=medium
    22
    33  * Initial release. (Closes: #XXXXXX)
  • main/trunk/package-kits/linux/managers/apt/debian/control

    r29511 r29577  
    1 Source: @NAME@
     1Source: %NAME%
    22Section: java
    33Priority: optional
     
    66Build-Depends:
    77    debhelper (>= 9),
    8     @MAKEDEPENDS@
     8    %MAKEDEPENDS%
    99
    10 Package: @NAME@
     10Package: %NAME%
    1111Architecture: all
    12 Homepage: @HOMEPAGE@
     12Homepage: %HOMEPAGE%
    1313Depends:
    14     @DEPENDS@
    15 Description: @DESCRIPTION_SHORT@
    16   @DESCRIPTION@
     14    %DEPENDS%
     15Description: %DESCRIPTION_SHORT%
     16  %DESCRIPTION%
  • main/trunk/package-kits/linux/managers/pacman/PKGBUILD

    r29546 r29577  
    11# Maintainer: Greenstone Team <greenstone_team@cs.waikato.ac.nz>
    2 pkgname=@NAME@
    3 pkgver=@VERSION@
    4 pkgrel=@RELEASE@
    5 pkgdesc=@DESCRIPTION@
    6 url=@HOMEPAGE@
    7 arch=(@ARCHITECTURE@)
    8 license=(@LICENSE_SHORT@)
    9 depends=(@DEPENDS@)
    10 optdepends=(@OPTDEPENDS@)
    11 makedepends=(@MAKEDEPENDS@)
    12 provides=(@PROVIDES@)
     2pkgname=%NAME%
     3pkgver=%VERSION%
     4pkgrel=%RELEASE%
     5pkgdesc=%DESCRIPTION%
     6url=%HOMEPAGE%
     7arch=(%ARCHITECTURE%)
     8license=(%LICENSE_SHORT%)
     9depends=(%DEPENDS%)
     10optdepends=(%OPTDEPENDS%)
     11makedepends=(%MAKEDEPENDS%)
     12provides=(%PROVIDES%)
    1313# conflicts=()
    1414# replaces=()
    1515# backup=()
    16 @INSTALL@
    17 source=(@SOURCES@
     16%INSTALL%
     17source=(%SOURCES%
    1818)
    19 md5sums=(@SOURCE_SUMS@
     19md5sums=(%SOURCE_SUMS%
    2020)
    2121
  • main/trunk/package-kits/linux/managers/rpm/@NAME@.spec

    r29546 r29577  
    1 Name:       @NAME@
    2 Version:    @VERSION@
    3 Release:    @RELEASE@
    4 Summary:    @DESCRIPTION_SHORT@
    5 License:    @LICENSE_SHORT@
    6 URL:        @HOMEPAGE@
    7 Source0:    @NAME@
     1Name:       %NAME%
     2Version:    %VERSION%
     3Release:    %RELEASE%
     4Summary:    %DESCRIPTION_SHORT%
     5License:    %LICENSE_SHORT%
     6URL:        %HOMEPAGE%
     7Source0:    %NAME%
    88
    99AutoReqProv: no
    10 BuildRequires:  @MAKEDEPENDS@
    11 Requires:   @DEPENDS@
     10BuildRequires:  %MAKEDEPENDS%
     11Requires:   %DEPENDS%
    1212
    1313%prep
     
    1515
    1616%description
    17 @DESCRIPTION@
     17%DESCRIPTION%
    1818
    1919%build
    20 cd @NAME@
     20cd %NAME%
    2121make %{?_smp_mflags}
    2222
    2323%install
    24 cd @NAME@
     24cd %NAME%
    2525%make_install
    2626
    27 @INSTALL@
     27%INSTALL%
    2828%files
    2929%doc
    30 @FILES@
     30%FILES%
    3131
    3232%changelog
  • main/trunk/package-kits/linux/packages/demo

    r29559 r29577  
    11SVN_LOCATION:           http://svn.greenstone.org/main/trunk/greenstone3/web/sites/localsite/collect
    2 NAME:                   @PKG_GREENSTONE_DEMO@
     2NAME:                   %PKG_GREENSTONE_DEMO%
    33VERSION:                3.06
    44RELEASE:                1
     
    1111
    1212DEPENDS:
    13     @PKG_GREENSTONE@
     13    %PKG_GREENSTONE%
    1414
    1515OPTDEPENDS:
    1616
    1717MAKEDEPENDS:
    18     @PKG_GREENSTONE_TOOLS@
    19     @PKG_SVN@
    20     @PKG_RSYNC@
     18    %PKG_GREENSTONE_TOOLS%
     19    %PKG_SVN%
     20    %PKG_RSYNC%
    2121
    2222PROVIDES:
    2323
    2424FILES:
    25     @WEB@/sites/localsite/collect/*
     25    %WEB%/sites/localsite/collect/*
    2626
    2727SOURCES:
     
    3535
    3636POST_INSTALL:
    37     chown -R @TOMCAT_USER@:@TOMCAT_USER@ @WEB@/sites/localsite/collect
     37    chown -R %TOMCAT_USER%:%TOMCAT_USER% %WEB%/sites/localsite/collect
  • main/trunk/package-kits/linux/packages/gli

    r29536 r29577  
    11SVN_LOCATION:           http://svn.greenstone.org/main/trunk/gli
    2 NAME:                   @PKG_GLI@
     2NAME:                   %PKG_GLI%
    33VERSION:                3.06
    44RELEASE:                1
     
    1111
    1212DEPENDS:
    13     @PKG_JAVA_JRE@
    14     @PKG_GREENSTONE_TOOLS@
     13    %PKG_JAVA_JRE%
     14    %PKG_GREENSTONE_TOOLS%
    1515
    1616OPTDEPENDS:
    1717
    1818MAKEDEPENDS:
    19     @PKG_JAVA_JDK@
    20     @PKG_SVN@
    21     @PKG_RSYNC@
     19    %PKG_JAVA_JDK%
     20    %PKG_SVN%
     21    %PKG_RSYNC%
    2222
    2323PROVIDES:
    2424
    2525FILES:
    26     @GLI@
     26    %GLI%
    2727    %{_bindir}/*
    2828
  • main/trunk/package-kits/linux/packages/main

    r29546 r29577  
    11SVN_LOCATION:           http://svn.greenstone.org/main/trunk/greenstone3
    2 NAME:                   @PKG_GREENSTONE@
     2NAME:                   %PKG_GREENSTONE%
    33VERSION:                3.06
    44RELEASE:                1
     
    1111
    1212DEPENDS:
    13     @PKG_JAVA_JRE@
    14     @PKG_TOMCAT@
     13    %PKG_JAVA_JRE%
     14    %PKG_TOMCAT%
     15    %PKG_WGET%
    1516
    1617OPTDEPENDS:
    17     @PKG_GREENSTONE_DEMO@
    18     @PKG_GREENSTONE_TOOLS@
     18    %PKG_GREENSTONE_DEMO%
     19    %PKG_GREENSTONE_TOOLS%
    1920
    2021MAKEDEPENDS:
    21     @PKG_JAVA_JDK@
    22     @PKG_SVN@
    23     @PKG_ANT@
    24     @PKG_PATCH@
    25     @PKG_AUTOCONF@
    26     @PKG_GCC@
    27     @PKG_MAKE@
    28     @PKG_RSYNC@
     22    %PKG_JAVA_JDK%
     23    %PKG_SVN%
     24    %PKG_ANT%
     25    %PKG_PATCH%
     26    %PKG_AUTOCONF%
     27    %PKG_GCC%
     28    %PKG_MAKE%
     29    %PKG_RSYNC%
    2930
    3031PROVIDES:
    3132
    3233FILES:
    33     @WEB@
    34     @TOMCATCONF@/*
    35     @TOMCATLIB@/*
     34    %WEB%
     35    %TOMCATCONF%/*
     36    %TOMCATLIB%/*
    3637    %{_libdir}/*
    3738
     
    4041    greenstone3.xml
    4142    gs2build.patch
    42     perl-util.patch
     43    servlets.patch
     44    gsdl3site.cfg.patch
     45    global.properties.patch
    4346
    4447MAKEFILE:
     
    5053
    5154POST_INSTALL:
    52     chown -R @TOMCAT_USER@:@TOMCAT_USER@ @WEB@
     55    chown -R %TOMCAT_USER%:%TOMCAT_USER% %WEB%
    5356
    5457POST_REMOVE:
  • main/trunk/package-kits/linux/packages/tools

    r29536 r29577  
    11SVN_LOCATION:           http://svn.greenstone.org/main/trunk/greenstone3
    2 NAME:                   @PKG_GREENSTONE_TOOLS@
     2NAME:                   %PKG_GREENSTONE_TOOLS%
    33VERSION:                3.06
    44RELEASE:                1
     
    1111
    1212DEPENDS:
    13     @PKG_WVWARE@
    14     @PKG_PERL@
    15     @PKG_IMAGEMAGICK@
     13    %PKG_WVWARE%
     14    %PKG_PERL%
     15    %PKG_IMAGEMAGICK%
     16    %PKG_WGET%
    1617
    1718OPTDEPENDS:
    18     @PKG_GLI@
     19    %PKG_GLI%
    1920
    2021MAKEDEPENDS:
    21     @PKG_JAVA_JDK@
    22     @PKG_SVN@
    23     @PKG_ANT@
    24     @PKG_PATCH@
    25     @PKG_AUTOCONF@
    26     @PKG_GCC@
    27     @PKG_MAKE@
    28     @PKG_RSYNC@
     22    %PKG_JAVA_JDK%
     23    %PKG_SVN%
     24    %PKG_ANT%
     25    %PKG_PATCH%
     26    %PKG_AUTOCONF%
     27    %PKG_GCC%
     28    %PKG_MAKE%
     29    %PKG_RSYNC%
    2930
    3031PROVIDES:
    3132
    3233FILES:
    33     @GSTOOLS@
     34    %GREENSTONE_HOME%/*
    3435    %{_bindir}/*
    3536
  • main/trunk/package-kits/linux/perllib/Greenstone/Config.pm

    r29546 r29577  
    2727    my $self = shift;
    2828    for (@_) {
    29         s/@([\w]+)@/$self->replacement($1)/ge;
     29        s/%([\w]+)%/$self->replacement($1)/ge;
    3030    }
    3131    return @_;
  • main/trunk/package-kits/linux/perllib/Greenstone/Package.pm

    r29551 r29577  
    146146    } else {
    147147        print '    - ', $dst, "\n";
    148         if (-B $src or $src =~ /\.patch$/i) {
     148        if (-B $src) {
    149149            # copy binary file
    150150            cp $src, $dst or die "Failed to copy '$src': $!";
  • main/trunk/package-kits/linux/segments/base

    r29546 r29577  
    1 systemlib  := @SYSTEMLIB@
    2 systembin  := @SYSTEMBIN@
    3 java       := @SYSTEMJAVA@
    4 web        := @WEB@
    5 tomcatlib  := @TOMCATLIB@
    6 tomcatconf := @TOMCATCONF@
    7 gstools    := @GSTOOLS@
    8 gli        := @GLI@
     1systemlib  := %SYSTEMLIB%
     2systembin  := %SYSTEMBIN%
     3java       := %SYSTEMJAVA%
     4web        := %WEB%
     5tomcatlib  := %TOMCATLIB%
     6tomcatconf := %TOMCATCONF%
     7gstools    := %GREENSTONE_HOME%
     8gli        := %GLI%
    99
    1010DESTDIR    ?= /
  • main/trunk/package-kits/linux/segments/build-core

    r29481 r29577  
    44    export JAVA_HOME=$(java) ; \
    55    yes | ant prepare
    6     patch -d src/ -p0 -N -i gs2build.patch || :
     6    # apply patches
     7    for patch in *.patch; do patch -d src/ -p0 -N -i $$patch; done || :
    78    cd src/gs2build/build-src ; \
    89    autoconf
     
    1617    JAVA_HOME=$(java) ant install
    1718    mv src/lib/jni/*.jar src/web/WEB-INF/lib/
    18     # patch for gs2build tempdir
    19     patch -d src/ -p0 -N -i perl-util.patch || :
    2019    # delete windows/mac stuff
    2120    find src/ -type d \( -iname "win32" -o -iname "windows" -o -iname "winutil" -o -iname "darwin" \) -exec rm -rf {} \; 2> /dev/null || :
  • main/trunk/package-kits/linux/segments/rpm

    r29559 r29577  
    11pkg: package
    22package:
    3     rm -rf ~/rpmbuild/SOURCES/@NAME@
    4     mkdir -p ~/rpmbuild/SPECS ~/rpmbuild/SOURCES/@NAME@
    5     cp @NAME@.spec ~/rpmbuild/SPECS
    6     rsync -a --info=STATS --exclude *.spec * ~/rpmbuild/SOURCES/@NAME@/
    7     rpmbuild -ba @NAME@.spec
     3    rm -rf ~/rpmbuild/SOURCES/%NAME%
     4    mkdir -p ~/rpmbuild/SPECS ~/rpmbuild/SOURCES/%NAME%
     5    cp %NAME%.spec ~/rpmbuild/SPECS
     6    rsync -a --info=STATS --exclude *.spec * ~/rpmbuild/SOURCES/%NAME%/
     7    rpmbuild -ba %NAME%.spec
  • main/trunk/package-kits/linux/segments/src

    r29508 r29577  
    11svn:
    22    @echo "Getting latest source"
    3     svn co @SVN_LOCATION@ svn
     3    svn co %SVN_LOCATION% svn
    44
    55src: svn
Note: See TracChangeset for help on using the changeset viewer.