Changeset 1796

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

Finally builds on my machine

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r1795 r1796  
    9898%build 
    9999#libselinux fragment 
    100 cd libselinux.linux.%{arch} 
    101 ant -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/ 
     100cd libselinux.%{_os}.%{arch} 
     101ant -f ${RPM_BUILD_DIR}/eclipse-cdsframework/framework-plugin/libselinuxjava/antbuild.xml -Dtarget_arch=%{arch} -Dtarget_dir=${RPM_BUILD_DIR}/eclipse-cdsframework/libselinux.%{_os}.%{arch}/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=${RPM_BUILD_DIR}/eclipse-cdsframework/libselinuxjava-plugin/library.jar -Dlibselinux_plugin_jar=${RPM_BUILD_DIR}/eclipse-cdsframework/libselinux.${_os}.%{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 
    …… 
    130130 
    131131LSEL_PLUGIN_DIR=%{eclipse_base}/plugins/com.tresys.libselinuxjava_${LSEL_PLUGIN_VER} 
    132 LSEL_FRAGMENT_DIR=%{eclipse_lib_base}/plugins/com.tresys.libselinuxjava.%{_os}.%{arch}_${LSEL_FRAGMENT_VER} 
     132LSEL_FRAGMENT_DIR=%{eclipse_lib_base}/plugins/com.tresys.libselinux.%{_os}.%{arch}_${LSEL_FRAGMENT_VER} 
    133133LSEL_FEATURE_DIR=%{eclipse_base}/features/com.tresys.libselinuxjava_${LSEL_FEATURE_VER} 
    134134LSEL_FRAGMENT_SRC=libselinux.%{_os}.%{arch} 
    135135 
    136136rm -rf ${RPM_BUILD_ROOT} 
    137 mkdir -pd -m755 ${RPM_BUILD_ROOT}${CDS_PLUGIN_DIR} 
    138 mkdir -pd -m755 ${RPM_BUILD_ROOT}${LSEL_PLUGIN_DIR} 
    139 mkdir -pd -m755 ${RPM_BUILD_ROOT}${LSEL_FRAGMENT_DIR} 
    140  
    141 mkdir -pd -m755 ${RPM_BUILD_ROOT}${CDS_FEATURE_DIR} 
    142 mkdir -pd -m755 ${RPM_BUILD_ROOT}${LSEL_FEATURE_DIR} 
     137install -pd -m755 ${RPM_BUILD_ROOT}${CDS_PLUGIN_DIR} 
     138install -pd -m755 ${RPM_BUILD_ROOT}${LSEL_PLUGIN_DIR} 
     139install -pd -m755 ${RPM_BUILD_ROOT}${LSEL_FRAGMENT_DIR} 
     140 
     141install -pd -m755 ${RPM_BUILD_ROOT}${CDS_FEATURE_DIR} 
     142install -pd -m755 ${RPM_BUILD_ROOT}${LSEL_FEATURE_DIR} 
    143143 
    144144#features 
    145 install -p -m644 ${RPM_SOURCE_DIR}/framework-feature/feature.xml ${RPM_BUILD_ROOT}${CDS_FEATURE_DIR} 
    146 install -p -m644 ${RPM_SOURCE_DIR}/libselinux-feature/feature.xml ${RPM_BUILD_ROOT}${LSEL_FEATURE_DIR} 
     145install -p -m644 ${RPM_BUILD_DIR}/eclipse-cdsframework/framework-feature/feature.xml ${RPM_BUILD_ROOT}${CDS_FEATURE_DIR} 
     146install -p -m644 ${RPM_BUILD_DIR}/eclipse-cdsframework/libselinux-feature/feature.xml ${RPM_BUILD_ROOT}${LSEL_FEATURE_DIR} 
    147147 
    148148# cds framework plugin 
    149 install -p -m644 ${RPM_BUILD_DIR}/framework-plugin/CDSFramework.jar ${RPM_BUILD_ROOT}${CDS_PLUGIN_DIR} 
    150 install -p -m644 ${RPM_BUILD_DIR}/framework-plugin/COPYING ${RPM_BUILD_ROOT}${CDS_PLUGIN_DIR} 
    151 install -p -m644 ${RPM_BUILD_DIR}/framework-plugin/plugin.xml ${RPM_BUILD_ROOT}${CDS_PLUGIN_DIR} 
    152 install -p -m644 ${RPM_BUILD_DIR}/framework-plugin/plugin.properties ${RPM_BUILD_ROOT}${CDS_PLUGIN_DIR} 
    153 install -p -m644  ${RPM_BUILD_DIR}/framework-plugin/about.html ${RPM_BUILD_ROOT}${CDS_PLUGIN_DIR} 
    154 cp -pR ${RPM_BUILD_DIR}/framework-plugin/icons ${RPM_BUILD_ROOT}${CDS_PLUGIN_DIR}/icons 
    155 cp -pR ${RPM_BUILD_DIR}/framework-plugin/resources ${RPM_BUILD_ROOT}${CDS_PLUGIN_DIR}/resources 
    156 cp -pR ${RPM_BUILD_DIR}/framework-plugin/META-INF ${RPM_BUILD_ROOT}${CDS_PLUGIN_DIR}/META-INF 
     149install -p -m644 ${RPM_BUILD_DIR}/eclipse-cdsframework/framework-plugin/CDSFramework.jar ${RPM_BUILD_ROOT}${CDS_PLUGIN_DIR} 
     150install -p -m644 ${RPM_BUILD_DIR}/eclipse-cdsframework/framework-plugin/COPYING ${RPM_BUILD_ROOT}${CDS_PLUGIN_DIR} 
     151install -p -m644 ${RPM_BUILD_DIR}/eclipse-cdsframework/framework-plugin/plugin.xml ${RPM_BUILD_ROOT}${CDS_PLUGIN_DIR} 
     152install -p -m644 ${RPM_BUILD_DIR}/eclipse-cdsframework/framework-plugin/plugin.properties ${RPM_BUILD_ROOT}${CDS_PLUGIN_DIR} 
     153install -p -m644  ${RPM_BUILD_DIR}/eclipse-cdsframework/framework-plugin/about.html ${RPM_BUILD_ROOT}${CDS_PLUGIN_DIR} 
     154cp -pR ${RPM_BUILD_DIR}/eclipse-cdsframework/framework-plugin/icons ${RPM_BUILD_ROOT}${CDS_PLUGIN_DIR}/icons 
     155cp -pR ${RPM_BUILD_DIR}/eclipse-cdsframework/framework-plugin/resources ${RPM_BUILD_ROOT}${CDS_PLUGIN_DIR}/resources 
     156cp -pR ${RPM_BUILD_DIR}/eclipse-cdsframework/framework-plugin/META-INF ${RPM_BUILD_ROOT}${CDS_PLUGIN_DIR}/META-INF 
    157157 
    158158# cds framework help 
    159 install -p -m644 ${RPM_BUILD_DIR}/framework-help/help.jar ${RPM_BUILD_ROOT}${CDS_HELP_JAR} 
     159install -p -m644 ${RPM_BUILD_DIR}/eclipse-cdsframework/framework-help/help.jar ${RPM_BUILD_ROOT}${CDS_HELP_JAR} 
    160160 
    161161#libselinuxjava fragment 
    162 cp -pR ${RPM_BUILD_DIR}/libselinux.${_os}.%{arch}/libselinuxjava/libselinuxjava.so ${RPM_BUILD_ROOT}%{LSEL_FRAGMENT_DIR}/libselinuxjava/ 
    163 cp -p ${RPM_BUILD_DIR}/libselinux.${_os}.%{arch}/libselinuxjava.jar ${RPM_BUILD_ROOT}${LSEL_FRAGMENT_DIR}/ 
    164 cp -pR ${RPM_BUILD_DIR}/libselinux.${_os}.%{arch}/META-INF ${RPM_BUILD_ROOT}${LSEL_FRAGMENT_DIR} 
     162install -pd -m755 ${RPM_BUILD_ROOT}${LSEL_FRAGMENT_DIR}/libselinuxjava  
     163 
     164cp -pR ${RPM_BUILD_DIR}/eclipse-cdsframework/libselinux.%{_os}.%{arch}/libselinuxjava/libselinuxjava.so ${RPM_BUILD_ROOT}${LSEL_FRAGMENT_DIR}/libselinuxjava/ 
     165cp -p ${RPM_BUILD_DIR}/eclipse-cdsframework/libselinux.%{_os}.%{arch}/libselinuxjava.jar ${RPM_BUILD_ROOT}${LSEL_FRAGMENT_DIR}/ 
     166cp -pR ${RPM_BUILD_DIR}/eclipse-cdsframework/libselinux.%{_os}.%{arch}/META-INF ${RPM_BUILD_ROOT}${LSEL_FRAGMENT_DIR} 
    165167 
    166168#libselinuxjava plugin 
    167 install -p -m644 ${RPM_BUILD_DIR}/libselinuxjava-plugin/plugin.jar ${RPM_BUILD_ROOT}${LSEL_PLUGIN_DIR} 
     169install -p -m644 ${RPM_BUILD_DIR}/eclipse-cdsframework/libselinuxjava-plugin/plugin.jar ${RPM_BUILD_ROOT}${LSEL_PLUGIN_DIR} 
    168170 
    169171 
    …… 
    188190%defattr(-,root,root,-) 
    189191%{eclipse_base}/plugins/com.tresys.cdsframework*/ 
    190 %{eclipse_base/features/com.tresys.cdsframework*/ 
    191  
    192 %{eclipse_bsse}/plugins/com.tresys.libselinux*/ 
    193 %{eclipse_base}/features/com.tresys.libselinux*/ 
     192%{eclipse_base}/features/com.tresys.cdsframework*/ 
     193 
     194%{eclipse_base}/plugins/com.tresys.libselinuxjava*/ 
     195%{eclipse_base}/features/com.tresys.libselinuxjava*/ 
    194196 
    195197%{eclipse_lib_base}/plugins/com.tresys.libselinux*/