Changeset 1549

Show
Ignore:
Timestamp:
03/16/07 14:55:00 (2 years ago)
Author:
dsugar
Message:

More cleanup of the build process

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build/SPEC/framework-eclipse.spec

    r1547 r1549  
     1ExclusiveArch: i386 x86 x86_64 
     2ExclusiveOS: linux 
    13 
    24%define major                   1 
    …… 
    1113%define help_dir                %{eclipse_base}/plugins/com.tresys.framework.doc.user_%{version} 
    1214 
     15%ifarch x86 
     16%define arch    x86 
     17%endif 
     18 
     19%ifarch i386 
     20%define arch    x86 
     21%endif 
     22 
     23%ifarch x86_64 
     24%define arch    x86_64 
     25%endif 
     26 
     27%define selinuxjava_dir %{eclipse_base}/plugins/com.tresys.framework.libselinuxjava.linux.%{arch}_%{version} 
     28 
    1329Summary: Cross Domain Solution SELinux policy editor plugin for Eclipse 
    14 Name: cdsframework 
     30Name: CDSFramework 
    1531Version: %{version} 
    1632Release: 1 
    1733License: GPL2 
    18 BuildArch: noarch 
     34#BuildArch: noarch 
    1935Group: Text Editors/Integrated Development Environments (IDE) 
    2036Packager: Dave Sugar <dsugar@tresys.com> 
    …… 
    2440Requires: eclipse-gef >= 3.2 
    2541Requires: libselinux >= 1.30 
     42Requires: slide >= 1.1.6 
    2643Source: http://oss.tresys.com/repos/slide/trunk/ 
    27 ExclusiveOS: linux 
    2844 
    2945BuildRequires: eclipse-pde  
    …… 
    3248BuildRequires: ant >= 1.6 
    3349BuildRequires: libselinux >= 1.30 
     50BuildRequires: slide >= 1.1.6 
    3451 
    3552BuildRoot: %{_tmppath}/%{name}-buildroot 
    …… 
    4360svn export http://oss.tresys.com/repos/cdsframework/trunk/framework-plugin/ ${RPM_SOURCE_DIR}/framework-plugin  
    4461svn export http://oss.tresys.com/repos/cdsframework/trunk/oss-feature/ ${RPM_SOURCE_DIR}/eclipse-feature 
     62svn export http://oss.tresys.com/repos/cdsframework/trunk/libselinux.linux.%{arch}/ ${RPM_SOURCE_DIR}/libselinux.linux.%{arch} 
    4563#svn export http://oss.tresys.com/repos/cdsframework/trunk/com.tresys.framework.doc.user/ ${RPM_SOURCE_DIR}/framework-help 
    4664rm -rf ${RPM_BUILD_DIR} 
    …… 
    4967mkdir -p ${RPM_BUILD_DIR}/framework-help 
    5068#cp -R ${RPM_SOURCE_DIR}/framework-help/* ${RPM_BUILD_DIR}/framework-help 
     69mkdir -p ${RPM_BUILD_DIR}/libselinux.linux.%{arch}/libselinuxjava 
     70cp -R ${RPM_SOURCE_DIR}/libselinux.linux.%{arch}/* ${RPM_BUILD_DIR}/libselinux.linux.%{arch} 
    5171 
    5272%build 
    5373cd ${RPM_BUILD_DIR}/framework-plugin 
    5474ant -f rpmbuild.xml buildjar 
     75 
     76cd libselinuxjava 
     77ant -f antbuild.xml -Dtarget_arch=%{arch} -Dtarget_dir=../../libselinux.linux.%{arch}/libselinuxjava 
     78 
     79cd ${RPM_BUILD_DIR}/libselinux.linux.%{arch}/ 
     80jar -cf libselinuxjava.jar META-INF/ 
    5581 
    5682%install 
    …… 
    5985mkdir -p ${RPM_BUILD_ROOT}%{feature_dir} 
    6086mkdir -p ${RPM_BUILD_ROOT}%{help_dir} 
     87mkdir -p ${RPM_BUILD_ROOT}%{selinuxjava_dir}/libselinuxjava 
    6188 
    6289cp ${RPM_BUILD_DIR}/framework-plugin/CDSFramework.jar ${RPM_BUILD_ROOT}%{plugin_dir} 
    …… 
    6895cp -R ${RPM_BUILD_DIR}/framework-plugin/META-INF ${RPM_BUILD_ROOT}%{plugin_dir}/META-INF 
    6996cp ${RPM_SOURCE_DIR}/eclipse-feature/feature.xml ${RPM_BUILD_ROOT}%{feature_dir} 
     97 
     98cp ${RPM_BUILD_DIR}/libselinux.linux.%{arch}/libselinuxjava/libselinuxjava.so ${RPM_BUILD_ROOT}%{selinuxjava_dir}/libselinuxjava/ 
     99cp ${RPM_BUILD_DIR}/libselinux.linux.%{arch}/libselinuxjava.jar ${RPM_BUILD_ROOT}%{selinuxjava_dir}/ 
     100cp -R ${RPM_BUILD_DIR}/libselinux.linux.%{arch}/META-INF ${RPM_BUILD_ROOT}%{selinuxjava_dir} 
     101 
     102 
    70103#cp -R ${RPM_SOURCE_DIR}/slide-help/* ${RPM_BUILD_ROOT}%{help_dir} 
    71104 
    72105install -d -m755 ${RPM_BUILD_ROOT}%{plugin_dir} 
     106install -d -m755 ${RPM_BUILD_ROOT}%{feature_dir} 
    73107install -d -m755 ${RPM_BUILD_ROOT}%{help_dir} 
     108install -d -m755 ${RPM_BUILD_ROOT}%{selinuxjava_dir} 
    74109 
    75110 
    …… 
    99134%dir %{plugin_dir}/resources/link 
    100135%dir %{feature_dir} 
    101  
     136%dir %{selinuxjava_dir}/libselinuxjava 
     137%dir %{selinuxjava_dir}/META-INF 
    102138 
    103139%{feature_dir}/feature.xml 
     140 
     141%{selinuxjava_dir}/libselinuxjava.jar 
     142%{selinuxjava_dir}/libselinuxjava/libselinuxjava.so 
     143%{selinuxjava_dir}/META-INF/MANIFEST.MF 
     144 
    104145%{plugin_dir}/CDSFramework.jar 
    105146%{plugin_dir}/COPYING 
    …… 
    124165%{plugin_dir}/icons/cview24/resource.png 
    125166%{plugin_dir}/icons/cview24/userdomain.png 
    126 %{plugin_dir}/icons/dlcl16/delete.gif 
    127 %{plugin_dir}/icons/elcl16/delete.gif 
    128167%{plugin_dir}/icons/framework.png 
    129168%{plugin_dir}/icons/framework_old.png 

  • trunk/framework-plugin/rpmbuild.xml

    r1546 r1549  
    1616        <property name="source" value="1.3"/> 
    1717        <path id="Plug-in Dependencies.libraryclasspath"> 
    18 <!-- 
    19                 <pathelement location="${ECLIPSE_HOME}" /> 
    20 --> 
    2118                <fileset dir="${ECLIPSE_HOME}"> 
    2219                        <include name="**/*.jar" /> 
    …… 
    2522                        <include name="**/*.jar" /> 
    2623                </fileset> 
    27 <!-- 
    28     <pathelement location="../../../usr/lib/eclipse/plugins/org.eclipse.swt.gtk.linux.x86_3.2.2.v3236.jar"/> 
    29 --> 
    30                 <pathelement location="../../../projects/slide/slide-plugin/src"/> 
    3124        </path> 
    3225        <path id="CDSFramework.classpath">