Changeset 29583

Timestamp:

2014-12-11T15:48:25+13:00 (9 years ago)

Author:

Jeremy Symon

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:

• global.conf (modified) (1 diff)
• packages/demo (modified) (1 diff)
• packages/gli (modified) (1 diff)
• packages/main (modified) (2 diffs)
• packages/native (added)
• packages/tools (modified) (1 diff)
• perllib/Greenstone/Package.pm (modified) (2 diffs)
• segments/main (modified) (1 diff)
• segments/native (added)

main/trunk/package-kits/linux/global.conf

@@ -1 +1 @@
 PKG_GREENSTONE:
     greenstone
+PKG_GREENSTONE_NATIVE:
+    greenstone-native
 PKG_GREENSTONE_TOOLS:
     greenstone-tools

main/trunk/package-kits/linux/packages/demo

@@ -3 +3 @@
 VERSION:                3.06
 RELEASE:                1
-DESCRIPTION_SHORT:      short description
-DESCRIPTION:            description
+DESCRIPTION_SHORT:      'Demo collections for Greenstone'
+DESCRIPTION:            'Several example collections for Greenstone Digital Library'
 HOMEPAGE:               http://greenstone.org
-ARCHITECTURE:           i686 x86_64
+ARCHITECTURE:           any
 LICENSE_SHORT:          GPL-2
-LICENSE:                license
+LICENSE:                
 
 DEPENDS:

main/trunk/package-kits/linux/packages/gli

@@ -3 +3 @@
 VERSION:                3.06
 RELEASE:                1
-DESCRIPTION_SHORT:      short description
-DESCRIPTION:            description
+DESCRIPTION_SHORT:      'Greenstone Librarian Interface'
+DESCRIPTION:            'A GUI interface for using the Greenstone Tools'
 HOMEPAGE:               http://greenstone.org
 ARCHITECTURE:           any
 LICENSE_SHORT:          GPL-2
-LICENSE:                license
+LICENSE:                
 
 DEPENDS:

main/trunk/package-kits/linux/packages/main

@@ -3 +3 @@
 VERSION:                3.06
 RELEASE:                1
-DESCRIPTION_SHORT:      short description
-DESCRIPTION:            description
+DESCRIPTION_SHORT:      'Greenstone Digital Library'
+DESCRIPTION:            'Greenstone is a suite of software for building and distributing digital library collections'
 HOMEPAGE:               http://greenstone.org
-ARCHITECTURE:           i686 x86_64
+ARCHITECTURE:           any
 LICENSE_SHORT:          GPL-2
-LICENSE:                license
+LICENSE:                
 
 DEPENDS:
+    %PKG_GREENSTONE_NATIVE%
+    %PKG_GREENSTONE_TOOLS%
     %PKG_JAVA_JRE%
     %PKG_TOMCAT%
@@ -17 +19 @@
 OPTDEPENDS:
     %PKG_GREENSTONE_DEMO%
-    %PKG_GREENSTONE_TOOLS%
 
 MAKEDEPENDS:

main/trunk/package-kits/linux/packages/tools

@@ -3 +3 @@
 VERSION:                3.06
 RELEASE:                1
-DESCRIPTION_SHORT:      short description
-DESCRIPTION:            description
+DESCRIPTION_SHORT:      'Tools for building Greenstone collections'
+DESCRIPTION:            
 HOMEPAGE:               http://greenstone.org
-ARCHITECTURE:           i686 x86_64
+ARCHITECTURE:           %ARCH%
 LICENSE_SHORT:          GPL-2
-LICENSE:                license
+LICENSE:                
 
 DEPENDS:

main/trunk/package-kits/linux/perllib/Greenstone/Package.pm

@@ -7 +7 @@
 use File::Path 'make_path';
 use File::Copy 'cp';
+use POSIX 'uname';
 use Greenstone::Helpers;
 use base 'Exporter';
@@ -57 +58 @@
     $self->readconf ("global.conf");
     $self->readconf ($distro_conf);
-    
+    $self->{config}->{ARCH} = (uname)[4];
+
     die "Distro '$args{distro}' is invalid (does not specify a manager)"
         unless (exists $self->{config}->{MANAGER});

main/trunk/package-kits/linux/segments/main

@@ -1 +1 @@
 install:
-    install -d $(DESTDIR)/$(web) $(DESTDIR)/$(systemlib) $(DESTDIR)/$(tomcatlib)
+    install -d $(DESTDIR)/$(web)
     install -dm775 $(DESTDIR)/$(tomcatlib)
-    install -Dm755 src/lib/jni/*.so $(DESTDIR)/$(systemlib)
     rsync -a --info=STATS --exclude sites/localsite/collect/ --exclude .svn src/web/ $(DESTDIR)/$(web)/
+    mv $(DESTDIR)/$(web)/WEB-INF/lib/derby.jar $(DESTDIR)/$(tomcatlib)
     install -Dm644 greenstone3.xml $(DESTDIR)/$(tomcatconf)/greenstone3.xml
-    mv $(DESTDIR)/$(web)/WEB-INF/lib/derby.jar $(DESTDIR)/$(tomcatlib)