Changeset 29474

Show
Ignore:
Timestamp:
27.11.2014 17:37:57 (5 years ago)
Author:
jts21
Message:

Got deb packages working

Location:
main/trunk/package-kits/linux
Files:
11 added
11 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/package-kits/linux/ReadMe

    r29460 r29474  
    55        patch -p0 -i package.patch 
    66        where -p0 assumes the paths in the patch are valid in the current directory 
     7 
    78    gs2build.patch 
    89        Contains patches for the gs2build build process 
    910        Disables building externals 
    10  
    1111    perl-util.patch 
    1212        Contains a patch to change the tmp folder for gs2build 
     
    2828 
    2929Issues: 
    30     - 
     30    Debian package has lots of warnings 
  • main/trunk/package-kits/linux/deb/gli/debian/changelog

    r29473 r29474  
    1 gli (0.01) UNRELEASED; urgency=medium 
     1gli (3.06) UNRELEASED; urgency=medium 
    22 
    33  * Initial release. (Closes: #XXXXXX) 
  • main/trunk/package-kits/linux/deb/gli/debian/control

    r29471 r29474  
    44Maintainer: Greenstone Team <greenstone_team@cs.waikato.ac.nz> 
    55Uploaders: Jeremy Symon <jtsymon@gmail.com> 
    6 Build-Depends: debhelper (>= 9) 
     6Build-Depends: 
     7    debhelper (>= 9), 
     8    default-jdk, 
     9    subversion 
    710 
    811Package: gli 
    912Architecture: all 
    1013Homepage: http://greenstone.org 
    11 Depends: greenstone-tools 
     14Depends: 
     15    greenstone-tools, 
     16    default-jre 
    1217Description: Greenstone Librarian Interface 
    1318 GUI frontend to greenstone-tools 
  • main/trunk/package-kits/linux/deb/gsdl

    • Property svn:ignore
      •  

        old new  
        11svn 
        22src 
        3 pkg 
         3build 
         4prepare 
  • main/trunk/package-kits/linux/deb/gsdl/Makefile

    r29471 r29474  
    1 systemlib   := /usr/lib 
    2 java        := $(systemlib)/jvm/default-java 
    3 systembin   := /usr/bin 
    4 gssrv       := /srv/gsdl 
    5 tomcatlib   := /usr/share/java/tomcat7 
    6 tomcatconf  := /etc/tomcat7/Catalina/localhost 
    7 gstools     := /opt/greenstone 
     1systemlib   := /usr/lib 
     2java        := $(systemlib)/jvm/default-java 
     3systembin   := /usr/bin 
     4gssrv       := /srv/gsdl 
     5tomcatlib   := /usr/share/tomcat7/lib 
     6tomcatconf  := /etc/tomcat7/Catalina/localhost 
     7gstools     := /opt/greenstone 
     8DESTDIR     ?= / 
    89 
    9 all: cleanpkg main tools demo 
     10all: build 
     11 
     12deb: 
     13    # generate .install files 
     14    rm -f debian/*.install 
     15    echo $(gssrv) >> debian/greenstone.install 
     16    echo $(tomcatlib) >> debian/greenstone.install 
     17    echo $(systemlib) >> debian/greenstone.install 
     18    echo $(tomcatconf) >> debian/greenstone.install 
     19    echo $(gstools) >> debian/greenstone-tools.install 
     20    echo $(systembin) >> debian/greenstone-tools.install 
     21    dpkg-buildpackage -rfakeroot 
    1022 
    1123svn: 
     
    1729    $(eval srcver := $(shell if test -d src; then cd src && svnversion -c | grep -o '[[:digit:]:]*'; else echo "nope"; fi)) 
    1830    if test $(svnver) != $(srcver); then \ 
     31    $(MAKE) clean ; \ 
    1932    echo "Making copy of source" ; \ 
    20     rm -rf src ; \ 
    2133    cp -rT svn src ; \ 
    2234    fi 
    2335 
    24 cleanpkg: 
    25     @echo Cleaning pkg directory 
    26     rm -rf pkg 
    27  
    28 clean: cleanpkg 
     36clean: 
    2937    @echo "Cleaning src directory" 
    3038    rm -rf src 
     39    rm -f prepare build 
    3140 
    3241cleanall: clean 
     
    4554    rm -rf src/packages/axis/docs 
    4655    rm -rf src/gs2build/build-src/packages 
     56    touch prepare 
    4757 
    4858build: prepare 
    4959    cd src ; \ 
    50     export JAVA_HOME=$(java) ; \ 
    51     ant install 
     60    JAVA_HOME=$(java) ant install 
    5261    mv src/lib/jni/*.jar src/web/WEB-INF/lib/ 
    5362    # patch for gs2build tempdir 
     
    5665    find src/ -type d \( -iname "win32" -o -iname "windows" -o -iname "winutil" -o -iname "darwin" \) -exec rm -rf {} \; 2> /dev/null || : 
    5766    find src/ \( -iname "*.dll" -o -iname "*.exe" \) -exec rm -rf {} \; || : 
     67    touch build 
    5868 
    59 main: build 
    60     $(eval pkgdir := pkg/main) 
    61     install -d $(pkgdir)/$(gssrv) $(pkgdir)/$(systemlib) $(pkgdir)/$(tomcatlib) 
    62     install -dm775 $(pkgdir)/$(tomcatlib) 
    63     install -Dm755 src/lib/jni/*.so $(pkgdir)/$(systemlib) 
    64     rsync -av --exclude sites/localsite/collect/ --exclude .svn src/web/ $(pkgdir)/$(gssrv)/ 
    65     install -Dm644 greenstone3.xml $(pkgdir)/$(tomcatconf)/greenstone3.xml 
    66     mv $(pkgdir)/$(gssrv)/WEB-INF/lib/derby.jar $(pkgdir)/$(tomcatlib) 
     69install: install-main install-tools 
    6770 
    68 tools: build  
    69     $(eval pkgdir := pkg/tools) 
    70     install -d $(pkgdir)/$(gstools) 
    71     rsync -av --exclude build-src --exclude common-src --exclude collect/demo --exclude .svn src/gs2build $(pkgdir)/$(gstools)/ 
    72     rsync -av --exclude build-src --exclude common-src --exclude collect/demo --exclude .svn src/bin $(pkgdir)/$(gstools)/ 
    73     install -Dm755 greenstone $(pkgdir)/$(systembin)/greenstone 
     71install-main: build 
     72    install -d $(DESTDIR)/$(gssrv) $(DESTDIR)/$(systemlib) $(DESTDIR)/$(tomcatlib) 
     73    install -dm775 $(DESTDIR)/$(tomcatlib) 
     74    install -Dm755 src/lib/jni/*.so $(DESTDIR)/$(systemlib) 
     75    rsync -a --info=STATS --exclude sites/localsite/collect/ --exclude .svn src/web/ $(DESTDIR)/$(gssrv)/ 
     76    install -Dm644 greenstone3.xml $(DESTDIR)/$(tomcatconf)/greenstone3.xml 
     77    mv $(DESTDIR)/$(gssrv)/WEB-INF/lib/derby.jar $(DESTDIR)/$(tomcatlib) 
    7478 
    75 demo: build 
    76     $(eval pkgdir := pkg/demo) 
    77     @echo "Building demo collections" 
    78     $(shell find sites/localsite/collect/ -mindepth 1 -maxdepth 1 -not -name ".*" -execdir bash -c 'col="$(basename $1)"; import.pl -removeold -site localsite "$$col"; buildcol.pl -removeold -site localsite "$$col"; mv "$$col/building" "$$col/index"' -- {} \;) 
    79     install -d $(pkgdir)/$(gssrv)/sites/localsite 
    80     rsync -av --exclude .svn src/web/sites/localsite/collect $(pkgdir)/$(gssrv)/sites/localsite/ 
     79install-tools: build  
     80    install -d $(DESTDIR)/$(gstools) 
     81    rsync -a --info=STATS --exclude build-src --exclude common-src --exclude collect/demo --exclude .svn src/gs2build $(DESTDIR)/$(gstools)/ 
     82    rsync -a --info=STATS --exclude build-src --exclude common-src --exclude collect/demo --exclude .svn src/bin $(DESTDIR)/$(gstools)/ 
     83    install -Dm755 greenstone $(DESTDIR)/$(systembin)/greenstone 
    8184 
    82 .PHONY: svn cleanpkg clean cleanall prepare build main tools demo 
     85.PHONY: svn clean cleanall install install-main install-tools 
  • main/trunk/package-kits/linux/deb/gsdl/debian

    • Property svn:ignore set to
      files
      tmp
      greenstone
      greenstone-tools
      *.log
      *.substvars
  • main/trunk/package-kits/linux/deb/gsdl/debian/changelog

    r29471 r29474  
    1 greenstone (VERSION) UNRELEASED; urgency=medium 
     1greenstone (3.06) UNRELEASED; urgency=medium 
    22 
    33  * Initial release. (Closes: #XXXXXX) 
  • main/trunk/package-kits/linux/deb/gsdl/debian/control

    r29471 r29474  
    44Maintainer: Greenstone Team <greenstone_team@cs.waikato.ac.nz> 
    55Uploaders: Jeremy Symon <jtsymon@gmail.com> 
    6 Build-Depends: debhelper (>= 9) 
     6Build-Depends: 
     7    debhelper (>= 9), 
     8    subversion, 
     9    default-jdk, 
     10    ant, 
     11    patch, 
     12    autoconf, 
     13    gcc, 
     14    make, 
     15    perl 
    716 
    817Package: greenstone 
     
    1019Homepage: http://greenstone.org 
    1120Depends: 
     21    default-jre, 
     22    tomcat7 
    1223Description: Greenstone Digital Library 
    1324 Greenstone is a suite of software for building and distributing digital library collections. 
     
    1728Homepage: http://greenstone.org 
    1829Depends: 
     30    default-jre, 
     31    wv, 
     32    perl, 
     33    imagemagick 
    1934Description: Greenstone Digital Library Tools 
    20  
    21 Package: greenstone-demo 
    22 Architecture: all 
    23 Homepage: http://greenstone.org 
    24 Depends: 
    25 Description: Greenstone Digital Library Demo Collections 
  • main/trunk/package-kits/linux/deb/gsdl/debian/rules

    r29471 r29474  
    1  #!/usr/bin/make -f 
     1#!/usr/bin/make -f 
    22 
     3%: 
     4    dh $@ --with autotools_dev 
    35 
     6override_dh_gencontrol: 
     7    dh_gencontrol -pgreenstone 
     8    dh_gencontrol -pgreenstone-tools 
  • main/trunk/package-kits/linux/gli

    r29460 r29474  
    1 #!/bin/sh 
     1#!/bin/bash 
    22 
    3 export JAVA_HOME=/usr/lib/jvm/default 
     3if test -z "$JAVA_HOME"; then 
     4    for dir in /usr/lib/jvm/default/ /usr/lib/jvm/default-java/; do 
     5        if test -d $dir; then 
     6            JAVA_HOME=$dir 
     7            break 
     8        fi 
     9    done 
     10fi 
     11if test -z "$JAVA_HOME"; then 
     12    echo -e "Could not find JAVA_HOME.\nPlease export JAVA_HOME=<jre_location>" >&2 
     13    exit 1 
     14fi 
     15 
     16export JAVA_HOME 
    417 
    518. greenstone --no-interactive 
  • main/trunk/package-kits/linux/greenstone

    r29460 r29474  
    1616 
    1717# make sure we are sourced, and not run 
    18 if test "`basename $0`" == "greenstone" ; then 
     18if test "`basename $0`" = "greenstone" ; then 
    1919# if $0 is "greenstone" we've been run... $0 is shellname if sourced. 
    2020# One exception is zsh has an option to set it temporarily to the script name