rpms/byteman
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Added bmsubmit, bminstall and bmjava scripts, RHBZ#951560

Browse Source
This commit is contained in:
Marek Goldmann 2013-04-24 14:42:59 +02:00
parent d226b278c8
commit 9864011244
2 changed files with 43 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
byteman-1.5.2-buildxml.patch
View File

@ -1,73 +0,0 @@
diff -Naur byteman-1.5.2-full/build-release-pkgs.xml byteman-1.5.2-full-work/build-release-pkgs.xml
--- byteman-1.5.2-full/build-release-pkgs.xml 2011-07-22 14:27:48.000000000 -0400
+++ byteman-1.5.2-full-work/build-release-pkgs.xml 2011-07-27 03:24:54.606871762 -0400
@@ -81,7 +81,7 @@
-->
<!-- a working direrctory for the process. Can contain output from
previous releases if you like to keep them archived locally. -->
- <property name="workdir" location="/tmp/packaged_builds"/>
+ <property name="workdir" location="./workdir"/>
<!-- where to get the source -->
<property name="svnbase" value="https://svn.jboss.org/repos/byteman/tags"/>
<!-- The tag as it appears under svnbase -->
@@ -199,8 +199,8 @@
<sequential>
<property name="groupid" value="org.jboss.byteman"/>
- <copy file="${workdir}/${tag}/maven/pom-template.xml"
- tofile="${workdir}/build/${tag}/pom-@{artifact}.xml"
+ <copy file="maven/pom-template.xml"
+ tofile="${workdir}/pom-@{artifact}.xml"
filtering="true">
<filterset>
<filter token="groupid" value="${groupid}"/>
@@ -209,7 +209,7 @@
<filter token="packaging" value="@{packaging}"/>
</filterset>
</copy>
-
+<!--
<exec executable="mvn" dir="${workdir}">
<arg value="deploy:deploy-file"/>
<arg value="-Dfile=@{dir}/@{artifact}.@{packaging}"/>
@@ -218,7 +218,7 @@
<arg value="-DpomFile=${workdir}/build/${tag}/pom-@{artifact}.xml"/>
<arg value="-DuniqueVersion=false"/>
</exec>
-
+-->
</sequential>
</macrodef>
@@ -227,7 +227,7 @@
<delete dir="${workdir}/build"/>
<mkdir dir="${workdir}/build"/>
- <mvn-artifact.src.macro artifact="byteman" dir="${workdir}/${tag}/install/lib/"/>
+ <!-- <mvn-artifact.src.macro artifact="byteman" dir="${workdir}/${tag}/install/lib/"/>-->
<mvn-artifact.macro artifact="byteman" dir="${workdir}/${tag}/install/lib/"/>
<mvn-artifact.macro artifact="byteman-submit" dir="${workdir}/${tag}/install/lib/"/>
<mvn-artifact.macro artifact="byteman-install" dir="${workdir}/${tag}/install/lib/"/>
diff -Naur byteman-1.5.2-full/build.xml byteman-1.5.2-full-work/build.xml
--- byteman-1.5.2-full/build.xml 2011-07-22 14:27:48.000000000 -0400
+++ byteman-1.5.2-full-work/build.xml 2011-07-27 03:21:58.574871685 -0400
@@ -26,7 +26,7 @@
<property environment="env"/>
<!-- version string stamped inside the manifests -->
- <property name="version" value="1.5.1-SNAPSHOT"/>
+ <property name="version" value="1.5.2"/>
<property name="ext.asm.jars" value="asm-all-3.0.jar"/>
@@ -150,8 +150,8 @@
<target name="byteman.jar.clear" unless="obfuscate.3rd.party">
<jarjar jarfile="${build.lib.dir}/${byteman.jar}" manifest="${manifest.file}">
<fileset dir="${build.classes.dir}" includes="**/*" excludes="**/install/*.class"/>
- <zipfileset src="${ext.lib.dir}/asm-all-3.0.jar"/>
- <zipfileset src="${ext.lib.dir}/javacuprt.jar"/>
+ <!--<zipfileset src="${ext.lib.dir}/asm-all-3.0.jar"/>
+ <zipfileset src="${ext.lib.dir}/javacuprt.jar"/>-->
<manifest>
<attribute name="Implementation-Version" value="${version}"/>
</manifest>

46
byteman.spec
View File

@ -1,6 +1,9 @@
%global homedir %{_datadir}/%{name}
%global bindir %{homedir}/bin
Name: byteman
Version: 2.0.4
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Java agent-based bytecode injection tool
Group: Development/Libraries
License: LGPLv2+
@ -33,8 +36,10 @@ Requires: jpackage-utils
Requires: java
# Bundling
Provides: bundled(java_cup) = 0.11a-12
Provides: bundled(objectweb-asm) = 3.3.1-5
#BuildRequires: java_cup = 1:0.11a-12
#BuildRequires: objectweb-asm = 0:3.3.1-7
Provides: bundled(java_cup) = 1:0.11a-12
Provides: bundled(objectweb-asm) = 0:3.3.1-7
%description
Byteman is a tool which simplifies tracing and testing of Java programs.
@ -66,9 +71,31 @@ sed -i "s|java-cup|java_cup|" agent/pom.xml
%mvn_build
%install
install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
install -d -m 755 $RPM_BUILD_ROOT%{homedir}
install -d -m 755 $RPM_BUILD_ROOT%{homedir}/lib
install -d -m 755 $RPM_BUILD_ROOT%{bindir}
install -m 755 bin/bmsubmit.sh $RPM_BUILD_ROOT%{bindir}/bmsubmit
install -m 755 bin/bminstall.sh $RPM_BUILD_ROOT%{bindir}/bminstall
install -m 755 bin/bmjava.sh $RPM_BUILD_ROOT%{bindir}/bmjava
install -m 755 bin/bmcheck.sh $RPM_BUILD_ROOT%{bindir}/bmcheck
for f in bmsubmit bmjava bminstall bmcheck; do
cat > $RPM_BUILD_ROOT%{_bindir}/${f} << EOF
#!/bin/sh
export BYTEMAN_HOME=/usr/share/byteman
\$BYTEMAN_HOME/bin/${f}
EOF
done
chmod 755 $RPM_BUILD_ROOT%{_bindir}/*
for m in install sample submit; do
# JAR
install -pm 644 ${m}/target/%{name}-${m}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-${m}.jar
@ -99,9 +126,19 @@ install -pm 644 agent/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-%{name}
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
for m in bmunit dtest install sample submit; do
ln -s %{_javadir}/byteman/byteman-${m}.jar $RPM_BUILD_ROOT%{homedir}/lib/byteman-${m}.jar
done
ln -s %{_javadir}/byteman/byteman.jar $RPM_BUILD_ROOT%{homedir}/lib/byteman.jar
%files
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
%{bindir}/*
%{homedir}/*
%{homedir}/lib/*
%{_bindir}/*
%{_javadir}/*
%doc README docs/ProgrammersGuide.pdf docs/copyright.txt
@ -110,6 +147,9 @@ cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%doc docs/copyright.txt
%changelog
* Wed Apr 24 2013 Marek Goldmann <mgoldman@redhat.com> - 2.0.4-2
- Added bmsubmit, bminstall and bmjava scripts, RHBZ#951560
* Thu Feb 21 2013 Marek Goldmann <mgoldman@redhat.com> - 2.0.4-1
- Upstream release 2.0.4
- Switched to Maven