Changeset 1795

Show
Ignore:
Timestamp:
01/07/08 14:08:36 (1 year ago)
Author:
dsugar
Message:

More work to update rpm building

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/build/SPEC/eclipse-cdsframework.spec

    r1786 r1795  
    9999#libselinux fragment 
    100100cd libselinux.linux.%{arch} 
    101 ant -f ../framework-plugin/libselinuxjava/antbuild.xml -Dtarget_arch=%{arch} -Dtarget_dir=./libselinuxjava -Djava_target_dir=./src/com/tresys/framework/compiler/linkage/libselinuxjava/ 
     101ant -f ${RPM_BUILD_DIR}/eclipse-cdsframework/framework-plugin/libselinuxjava/antbuild.xml -Dtarget_arch=%{arch} -Dtarget_dir=${RPM_BUILD_DIR}/eclipse-cdsframework/libselinuxjava -Djava_target_dir=${RPM_BUILD_DIR}/eclipse-cdsframework/framework-plugin/src/com/tresys/framework/compiler/linkage/libselinuxjava/ 
    102102#jar -cf libselinuxjava.jar META-INF/ 
    103103ant -f rpmbuild.xml buildjar 
     
    113113#cdsframework plugin 
    114114cd ../framework-plugin 
    115 ant -f rpmbuild.xml -Dlibselinux_fragment_jar=../libselinuxjava-plugin/library.jar -Dlibselinux_plugin_jar=../libselinux.linux.%{arch}/libselinuxjava.jar buildjar 
     115ant -f rpmbuild.xml -Dlibselinux_fragment_jar=${RPM_BUILD_DIR}/eclipse-cdsframework/libselinuxjava-plugin/library.jar -Dlibselinux_plugin_jar=${RPM_BUILD_DIR}/eclipse-cdsframework/libselinux.${_os}.%{arch}/libselinuxjava.jar buildjar 
    116116 
    117117 
  • trunk/build/buildrpm.sh

    r1786 r1795  
    4949tar -czf ${TOPDIR}/SOURCES/eclipse-cdsframework-${VERSION}.tar.gz * 
    5050 
    51 #rpmbuild -ba ${TOPDIR}/SPEC/eclipse-framework.spec 
     51#rpmbuild -ba ${TOPDIR}/SPEC/eclipse-cdsframework.spec 
  • trunk/framework-plugin/rpmbuild.xml

    r1786 r1795  
    7171                        <classpath refid="CDSFramework.classpath"/> 
    7272                </javac> 
     73<!-- 
    7374                <javac destdir="bin" debug="true" debuglevel="${debuglevel}" source="${source}" target="${target}"> 
    7475                        <src path="Junit"/> 
    7576                        <classpath refid="CDSFramework.classpath"/> 
    7677                </javac> 
     78--> 
    7779        </target> 
    7880        <target name="build-refprojects" description="Build all projects which reference this project. Useful to propagate changes."/>