Changeset 1786

Show
Ignore:
Timestamp:
12/31/07 15:11:53 (1 year ago)
Author:
dsugar
Message:

Update ant build scripts - should be a bit faster to build this way!

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r1785 r1786  
    11#ExclusiveArch: i386 x86 x86_64 
    22ExclusiveOS: linux 
     3 
     4%define slide_min_ver           1.3.4 
    35 
    46BuildRequires: eclipse-pde  
    …… 
    3840 
    3941#%define slide_min_ver          %(wget -q -O - %{svnbase}/framework-plugin/META-INF/MANIFEST.MF | grep slide | cut -d '"' -f 2) 
    40 %define slide_min_ver           1.3.4 
    4142 
    4243#%define cds_feature_dir                %{eclipse_base}/features/com.tresys.cdsframework_%{cds_fet_version} 
    …… 
    6667Requires: eclipse-slide >= %{slide_min_ver} 
    6768 
    68 BuildRoot: %(mktmp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) 
     69BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) 
    6970 
    7071%description 
    …… 
    164165 
    165166#libselinuxjava plugin 
    166 install -p -m644 ${RPM_BUILD_DIR}/libselinux-plugin/plugin.jar ${RPM_BUILD_ROOT}${LSEL_PLUGIN_DIR} 
     167install -p -m644 ${RPM_BUILD_DIR}/libselinuxjava-plugin/plugin.jar ${RPM_BUILD_ROOT}${LSEL_PLUGIN_DIR} 
    167168 
    168169 

  • trunk/build/buildrpm.sh

    r1785 r1786  
    3939svn export ${SVNROOT}/oss-feature ${TMPDIR}/framework-feature 
    4040svn export ${SVNROOT}/helpfiles ${TMPDIR}/framework-help 
    41 svn export ${SVNROOT}/libselinuxjava-plugin ${TMPDIR}/libselinux-plugin 
     41svn export ${SVNROOT}/libselinuxjava-plugin ${TMPDIR}/libselinuxjava-plugin 
    4242svn export ${SVNROOT}/libselinux.linux.x86 ${TMPDIR}/libselinux.linux.x86 
    4343svn export ${SVNROOT}/libselinux.linux.x86_64 ${TMPDIR}/libselinux.linux.x86_64 
    …… 
    4646svn export ${SVNROOT}/build/SPEC/eclipse-cdsframework.spec ${TOPDIR}/SPECS/eclipse-cdsframework.spec 
    4747 
    48 VERSION=`grep VERSION: ${TOPDIR}/SPECS/eclipse-cdsframework.spec | cut -d ' ' -f 2` 
     48VERSION=`grep Version: ${TOPDIR}/SPECS/eclipse-cdsframework.spec | cut -d ' ' -f 2` 
    4949tar -czf ${TOPDIR}/SOURCES/eclipse-cdsframework-${VERSION}.tar.gz * 
    5050 
    51 #rpmbuild -ba SPEC/eclipse-framework.spec 
     51#rpmbuild -ba ${TOPDIR}/SPEC/eclipse-framework.spec 

  • trunk/framework-plugin/rpmbuild.xml

    r1647 r1786  
    2626 
    2727                <fileset dir="/usr"> 
    28                         <include name="**/eclipse/**/*.jar" /> 
     28                        <include name="lib/eclipse/**/*.jar" /> 
     29                        <include name="lib64/eclipse/**/*.jar" /> 
     30                        <include name="share/eclipse/**/*.jar" /> 
    2931                </fileset> 
    3032<!-- 

  • trunk/libselinux.linux.x86/rpmbuild.xml

    r1643 r1786  
    44        <path id="project.classpath"> 
    55        <fileset dir="/usr"> 
    6                 <include name="**/eclipse/**/*.jar" /> 
     6                <include name="lib/eclipse/**/*.jar" /> 
     7                <include name="lib64/eclipse/**/*.jar" /> 
     8                <include name="share/eclipse/**/*.jar" /> 
    79        </fileset> 
    810    </path> 

  • trunk/libselinux.linux.x86_64/rpmbuild.xml

    r1643 r1786  
    44        <path id="project.classpath"> 
    55        <fileset dir="/usr"> 
    6                 <include name="**/eclipse/**/*.jar" /> 
     6                <include name="lib/eclipse/**/*.jar" /> 
     7                <include name="lib64/eclipse/**/*.jar" /> 
     8                <include name="share/eclipse/**/*.jar" /> 
    79        </fileset> 
    810    </path> 

  • trunk/libselinuxjava-plugin/rpmbuild.xml

    r1644 r1786  
    77    <path id="project.classpath"> 
    88        <fileset dir="/usr"> 
    9                 <include name="**/eclipse/**/*.jar" /> 
     9                <include name="lib/eclipse/**/*.jar" /> 
     10                <include name="lib64/eclipse/**/*.jar" /> 
     11                <include name="share/eclipse/**/*.jar" /> 
    1012        </fileset> 
    1113        </path>