Changeset 29583

Show
Ignore:
Timestamp:
11.12.2014 15:48:25 (5 years ago)
Author:
jts21
Message:

Handling CPU architecture properly (now there is a separate architecture-specific packages for jni libraries, and greenstone-tools is also set to architecture-specific since it contains native binaries)

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

Legend:

Unmodified
Added
Removed
  • main/trunk/package-kits/linux/global.conf

    r29546 r29583  
    11PKG_GREENSTONE: 
    22    greenstone 
     3PKG_GREENSTONE_NATIVE: 
     4    greenstone-native 
    35PKG_GREENSTONE_TOOLS: 
    46    greenstone-tools 
  • main/trunk/package-kits/linux/packages/demo

    r29577 r29583  
    33VERSION:                3.06 
    44RELEASE:                1 
    5 DESCRIPTION_SHORT:      short description 
    6 DESCRIPTION:            description 
     5DESCRIPTION_SHORT:      'Demo collections for Greenstone' 
     6DESCRIPTION:            'Several example collections for Greenstone Digital Library' 
    77HOMEPAGE:               http://greenstone.org 
    8 ARCHITECTURE:           i686 x86_64 
     8ARCHITECTURE:           any 
    99LICENSE_SHORT:          GPL-2 
    10 LICENSE:                license 
     10LICENSE:                 
    1111 
    1212DEPENDS: 
  • main/trunk/package-kits/linux/packages/gli

    r29577 r29583  
    33VERSION:                3.06 
    44RELEASE:                1 
    5 DESCRIPTION_SHORT:      short description 
    6 DESCRIPTION:            description 
     5DESCRIPTION_SHORT:      'Greenstone Librarian Interface' 
     6DESCRIPTION:            'A GUI interface for using the Greenstone Tools' 
    77HOMEPAGE:               http://greenstone.org 
    88ARCHITECTURE:           any 
    99LICENSE_SHORT:          GPL-2 
    10 LICENSE:                license 
     10LICENSE:                 
    1111 
    1212DEPENDS: 
  • main/trunk/package-kits/linux/packages/main

    r29577 r29583  
    33VERSION:                3.06 
    44RELEASE:                1 
    5 DESCRIPTION_SHORT:      short description 
    6 DESCRIPTION:            description 
     5DESCRIPTION_SHORT:      'Greenstone Digital Library' 
     6DESCRIPTION:            'Greenstone is a suite of software for building and distributing digital library collections' 
    77HOMEPAGE:               http://greenstone.org 
    8 ARCHITECTURE:           i686 x86_64 
     8ARCHITECTURE:           any 
    99LICENSE_SHORT:          GPL-2 
    10 LICENSE:                license 
     10LICENSE:                 
    1111 
    1212DEPENDS: 
     13    %PKG_GREENSTONE_NATIVE% 
     14    %PKG_GREENSTONE_TOOLS% 
    1315    %PKG_JAVA_JRE% 
    1416    %PKG_TOMCAT% 
     
    1719OPTDEPENDS: 
    1820    %PKG_GREENSTONE_DEMO% 
    19     %PKG_GREENSTONE_TOOLS% 
    2021 
    2122MAKEDEPENDS: 
  • main/trunk/package-kits/linux/packages/tools

    r29577 r29583  
    33VERSION:                3.06 
    44RELEASE:                1 
    5 DESCRIPTION_SHORT:      short description 
    6 DESCRIPTION:            description 
     5DESCRIPTION_SHORT:      'Tools for building Greenstone collections' 
     6DESCRIPTION:             
    77HOMEPAGE:               http://greenstone.org 
    8 ARCHITECTURE:           i686 x86_64 
     8ARCHITECTURE:           %ARCH% 
    99LICENSE_SHORT:          GPL-2 
    10 LICENSE:                license 
     10LICENSE:                 
    1111 
    1212DEPENDS: 
  • main/trunk/package-kits/linux/perllib/Greenstone/Package.pm

    r29577 r29583  
    77use File::Path 'make_path'; 
    88use File::Copy 'cp'; 
     9use POSIX 'uname'; 
    910use Greenstone::Helpers; 
    1011use base 'Exporter'; 
     
    5758    $self->readconf ("global.conf"); 
    5859    $self->readconf ($distro_conf); 
    59      
     60    $self->{config}->{ARCH} = (uname)[4]; 
     61 
    6062    die "Distro '$args{distro}' is invalid (does not specify a manager)" 
    6163        unless (exists $self->{config}->{MANAGER}); 
  • main/trunk/package-kits/linux/segments/main

    r29546 r29583  
    11install: 
    2     install -d $(DESTDIR)/$(web) $(DESTDIR)/$(systemlib) $(DESTDIR)/$(tomcatlib) 
     2    install -d $(DESTDIR)/$(web) 
    33    install -dm775 $(DESTDIR)/$(tomcatlib) 
    4     install -Dm755 src/lib/jni/*.so $(DESTDIR)/$(systemlib) 
    54    rsync -a --info=STATS --exclude sites/localsite/collect/ --exclude .svn src/web/ $(DESTDIR)/$(web)/ 
     5    mv $(DESTDIR)/$(web)/WEB-INF/lib/derby.jar $(DESTDIR)/$(tomcatlib) 
    66    install -Dm644 greenstone3.xml $(DESTDIR)/$(tomcatconf)/greenstone3.xml 
    7     mv $(DESTDIR)/$(web)/WEB-INF/lib/derby.jar $(DESTDIR)/$(tomcatlib)