Changeset 1647

Show
Ignore:
Timestamp:
04/12/07 10:42:14 (2 years ago)
Author:
dsugar
Message:

Still working in getting RPM to build.
Just about there but more to finish up still.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r1600 r1647  
    99 
    1010#get version numbers from eclipse plugin files 
    11 %define version                 %(wget -q -O - %{svnbase}/oss-feature/feature.xml | xpath /feature/@version  2> /dev/null | cut -d '"' -f 2) 
    12 %define plugin_ver              %(wget -q -O - %{svnbase}/framework-plugin/META-INF/MANIFEST.MF | grep Bundle-Version | cut -d : -f 2 | tr -d " ") 
    13 %define selinuxjava_ver         %(wget -q -O - %{svnbase}/libselinux.linux.%{arch}/META-INF/MANIFEST.MF | grep Bundle-Version  | cut -d : -f 2 | tr -d " ") 
    14 %define help_ver                %(wget -q -O - %{svnbase}/helpfiles/META-INF/MANIFEST.MF | grep Bundle-Version | cut -d : -f 2 | tr -d " ") 
    15  
    16 %define feature_dir             %{eclipse_base}/features/com.tresys.framework_%{version} 
    17 %define plugin_dir              %{eclipse_base}/plugins/com.tresys.framework_%{plugin_ver} 
    18 %define help_jar                %{eclipse_base}/plugins/com.tresys.framework.doc.user_%{help_ver}.jar 
    19 %define selinuxjava_dir         %{eclipse_base}/plugins/com.tresys.framework.libselinuxjava.linux.%{arch}_%{selinuxjava_ver} 
     11%define cds_fet_version         %(wget -q -O - %{svnbase}/oss-feature/feature.xml | xpath /feature/@version  2> /dev/null | cut -d '"' -f 2) 
     12%define cds_plugin_ver          %(wget -q -O - %{svnbase}/framework-plugin/META-INF/MANIFEST.MF | grep Bundle-Version | cut -d : -f 2 | tr -d " ") 
     13%define help_ver                        %(wget -q -O - %{svnbase}/helpfiles/META-INF/MANIFEST.MF | grep Bundle-Version | cut -d : -f 2 | tr -d " ") 
     14 
     15%define selinux_plugin_ver      %(wget -q -O - %{svnbase}/libselinuxjava-plugin/META-INF/MANIFEST.MF | grep Bundle-Version  | cut -d : -f 2 | tr -d " ") 
     16%define selinux_frag_ver        %(wget -q -O - %{svnbase}/libselinux.linux.%{arch}/META-INF/MANIFEST.MF | grep Bundle-Version  | cut -d : -f 2 | tr -d " ") 
     17%define selinux_fet_ver         %(wget -q -O - %{svnbase}/libselinuxjava-oss-feature/feature.xml | xpath /feature/@version  2> /dev/null | cut -d '"' -f 2) 
     18 
     19%define cds_feature_dir         %{eclipse_base}/features/com.tresys.cdsframework_%{cds_fet_version} 
     20%define plugin_dir                      %{eclipse_base}/plugins/com.tresys.cdsframework_%{cds_plugin_ver} 
     21%define help_jar                        %{eclipse_base}/plugins/com.tresys.cdsframework.doc.user_%{help_ver}.jar 
     22 
     23%define selinux_feature_dir     %{eclipse_base}/features/com.tresys.cdsframework.libselinuxjava_feature_%{selinux_fet_ver} 
     24%define selinux_plugin_jar      %{eclipse_base}/plugins/com.tresys.cdsframework.libselinuxjava_%{selinux_plugin_ver}.jar 
     25%define selinux_frag_dir                %{eclipse_base}/plugins/com.tresys.framework.libselinuxjava.linux.%{arch}_%{selinux_frag_ver} 
    2026 
    2127%ifarch x86 
    …… 
    3339Summary: Cross Domain Solution SELinux policy editor plugin for Eclipse 
    3440Name: CDSFramework 
    35 Version: %{version} 
     41Version: %{cds_fet_version} 
    3642Release: 1 
    3743License: GPL2 
    …… 
    6672svn export %{svnbase}/framework-plugin/ ${RPM_SOURCE_DIR}/framework-plugin  
    6773svn export %{svnbase}/oss-feature/ ${RPM_SOURCE_DIR}/eclipse-feature 
     74svn export %{svnbase}/helpfiles/ ${RPM_SOURCE_DIR}/framework-help 
     75 
    6876svn export %{svnbase}/libselinux.linux.%{arch}/ ${RPM_SOURCE_DIR}/libselinux.linux.%{arch} 
    69 svn export %{svnbase}/helpfiles/ ${RPM_SOURCE_DIR}/framework-help 
     77svn export %{svnbase}/libselinuxjava-oss-feature/ ${RPM_SOURCE_DIR}/libselinuxjava-feature 
     78svn export %{svnbase}/libselinuxjava-plugin/ ${RPM_SOURCE_DIR}/libselinuxjava-plugin 
    7079 
    7180rm -rf ${RPM_BUILD_DIR} 
    …… 
    7483mkdir -p ${RPM_BUILD_DIR}/framework-help 
    7584cp -R ${RPM_SOURCE_DIR}/framework-help/* ${RPM_BUILD_DIR}/framework-help 
     85 
    7686mkdir -p ${RPM_BUILD_DIR}/libselinux.linux.%{arch}/libselinuxjava 
    7787cp -R ${RPM_SOURCE_DIR}/libselinux.linux.%{arch}/* ${RPM_BUILD_DIR}/libselinux.linux.%{arch} 
     88mkdir -p ${RPM_BUILD_DIR}/libselinuxjava-plugin 
     89cp -R ${RPM_SOURCE_DIR}/libselinuxjava-plugin/* ${RPM_BUILD_DIR}/libselinuxjava-plugin 
    7890 
    7991%build 
    80 cd ${RPM_BUILD_DIR}/framework-plugin 
     92cd ${RPM_BUILD_DIR}/libselinux.linux.%{arch} 
     93ant -f ${RPM_BUILD_DIR}/framework-plugin/libselinuxjava/antbuild.xml -Dtarget_arch=%{arch} -Dtarget_dir=${RPM_BUILD_DIR}/libselinux.linux.%{arch}/libselinuxjava -Djava_target_dir=${RPM_BUILD_DIR}/libselinux.linux.%{arch}/src/com/tresys/framework/compiler/linkage/libselinuxjava/ 
     94#jar -cf libselinuxjava.jar META-INF/ 
    8195ant -f rpmbuild.xml buildjar 
    8296 
    83 cd libselinuxjava 
    84 ant -f antbuild.xml -Dtarget_arch=%{arch} -Dtarget_dir=../../libselinux.linux.%{arch}/libselinuxjava 
    85  
    86 cd ${RPM_BUILD_DIR}/libselinux.linux.%{arch}/ 
    87 jar -cf libselinuxjava.jar META-INF/ 
     97cd ${RPM_BUILD_DIR}/libselinuxjava-plugin 
     98ant -f rpmbuild.xml buildjar 
    8899 
    89100cd ${RPM_BUILD_DIR}/framework-help 
    90101ant -f rpmbuild.xml 
     102 
     103cd ${RPM_BUILD_DIR}/framework-plugin 
     104ant -f rpmbuild.xml -Dlibselinux_fragment_jar=${RPM_BUILD_DIR}/libselinuxjava-plugin/library.jar -Dlibselinux_plugin_jar=${RPM_BUILD_DIR}/libselinux.linux.x86/libselinuxjava.jar buildjar 
     105 
     106 
    91107 
    92108%install 
    93109rm -rf ${RPM_BUILD_ROOT} 
    94110mkdir -p ${RPM_BUILD_ROOT}%{plugin_dir} 
    95 mkdir -p ${RPM_BUILD_ROOT}%{feature_dir} 
    96111mkdir -p ${RPM_BUILD_ROOT}%{selinuxjava_dir}/libselinuxjava 
     112 
     113mkdir -p ${RPM_BUILD_ROOT}%{cds_feature_dir} 
     114mkdir -p ${RPM_BUILD_ROOT}%{selinux_frag_dir} 
    97115 
    98116cp ${RPM_BUILD_DIR}/framework-plugin/CDSFramework.jar ${RPM_BUILD_ROOT}%{plugin_dir} 

  • trunk/framework-plugin/build-user.xml

    r1646 r1647  
    3030                javacchome="/usr/share/java" /> 
    3131</target> 
    32 <!--  
    33 <target name="libSELinux"> 
    34         <ant antfile="antbuild.xml" dir="libselinuxjava" /> 
    35 </target> 
    36  --> 
     32 
    3733<target name="copy"> 
    3834        <copy todir="bin"> 

  • trunk/framework-plugin/rpmbuild.xml

    r1550 r1647  
    2727                <fileset dir="/usr"> 
    2828                        <include name="**/eclipse/**/*.jar" /> 
    29                 </fileset>       
     29                </fileset> 
     30<!-- 
     31                <fileset dir="/usr/src/redhat/BUILD"> 
     32                        <include name="libselinuxjava-plugin/library.jar" /> 
     33                        <include name="libselinux.linux.x86/libselinuxjava.jar" /> 
     34                </fileset> 
     35--> 
     36                <pathelement location="${libselinux_fragment_jar}" /> 
     37                <pathelement location="${libselinux_plugin_jar}" /> 
    3038 
    3139        </path>