Author: twerner
Date: 2007-11-25 22:02:50 +0000 (Sun, 25 Nov 2007)
New Revision: 4843
Added:
trunk/junit/debian/ant.properties
trunk/junit/debian/build.xml
trunk/junit/debian/junit
trunk/junit/debian/junit.install
trunk/junit/debian/junit.manpages
trunk/junit/debian/orig-tar.sh
Removed:
trunk/junit/debian/AboutDialog.java.diff
trunk/junit/debian/TestRunner.java
trunk/junit/debian/dirs
trunk/junit/debian/junit-doc.docs
trunk/junit/debian/junit.sh
trunk/junit/debian/manpages
Modified:
trunk/junit/debian/changelog
trunk/junit/debian/compat
trunk/junit/debian/control
trunk/junit/debian/junit.links
trunk/junit/debian/rules
trunk/junit/debian/watch
Log:
UNRELEASED
* new upstream version (Closes: #452885)
* Set debhelper compat level to 5.
* Use ant for the build process.
Deleted: trunk/junit/debian/AboutDialog.java.diff
===================================================================
--- trunk/junit/debian/AboutDialog.java.diff 2007-11-25 20:39:00 UTC (rev
4842)
+++ trunk/junit/debian/AboutDialog.java.diff 2007-11-25 22:02:50 UTC (rev
4843)
@@ -1,12 +0,0 @@
-diff -uNr src.orig/junit/awtui/AboutDialog.java
src/junit/awtui/AboutDialog.java
---- src.orig/junit/awtui/AboutDialog.java 2003-09-12 07:52:49.000000000
+0900
-+++ src/junit/awtui/AboutDialog.java 2003-09-12 07:53:26.000000000 +0900
-@@ -5,7 +5,7 @@
-
- import junit.runner.Version;
-
--class AboutDialog extends Dialog {
-+public class AboutDialog extends Dialog {
- public AboutDialog(Frame parent) {
- super(parent);
-
Deleted: trunk/junit/debian/TestRunner.java
===================================================================
--- trunk/junit/debian/TestRunner.java 2007-11-25 20:39:00 UTC (rev 4842)
+++ trunk/junit/debian/TestRunner.java 2007-11-25 22:02:50 UTC (rev 4843)
@@ -1,541 +0,0 @@
-package junit.swingui;
-
-import java.awt.*;
-import java.awt.event.*;
-import junit.awtui.*;
-import java.awt.image.ImageProducer;
-import java.util.Vector;
-
-import junit.framework.*;
-import junit.runner.*;
-
-
-/**
- * An AWT based user interface to run tests.
- * Enter the name of a class which either provides a static
- * suite method or is a subclass of TestCase.
- * <pre>
- * Synopsis: java junit.awtui.TestRunner [-noloading] [TestCase]
- * </pre>
- * TestRunner takes as an optional argument the name of the testcase class to
be run.
- */
- public class TestRunner extends BaseTestRunner {
- protected Frame fFrame;
- protected Vector fExceptions;
- protected Vector fFailedTests;
- protected Thread fRunner;
- protected TestResult fTestResult;
-
- protected TextArea fTraceArea;
- protected TextField fSuiteField;
- protected Button fRun;
- protected ProgressBar fProgressIndicator;
- protected List fFailureList;
- protected Logo fLogo;
- protected Label fNumberOfErrors;
- protected Label fNumberOfFailures;
- protected Label fNumberOfRuns;
- protected Button fQuitButton;
- protected Button fRerunButton;
- protected TextField fStatusLine;
- protected Checkbox fUseLoadingRunner;
-
- protected static final Font PLAIN_FONT= new Font("dialog", Font.PLAIN,
12);
- private static final int GAP= 4;
-
- public TestRunner() {
- }
-
- private void about() {
- AboutDialog about= new AboutDialog(fFrame);
- about.setModal(true);
- about.setLocation(300, 300);
- about.setVisible(true);
- }
-
- public void testStarted(String testName) {
- showInfo("Running: "+testName);
- }
-
- public void testEnded(String testName) {
- setLabelValue(fNumberOfRuns, fTestResult.runCount());
- synchronized(this) {
- fProgressIndicator.step(fTestResult.wasSuccessful());
- }
- }
-
- public void testFailed(int status, Test test, Throwable t) {
- switch (status) {
- case TestRunListener.STATUS_ERROR:
-
fNumberOfErrors.setText(Integer.toString(fTestResult.errorCount()));
- appendFailure("Error", test, t);
- break;
- case TestRunListener.STATUS_FAILURE:
-
fNumberOfFailures.setText(Integer.toString(fTestResult.failureCount()));
- appendFailure("Failure", test, t);
- break;
- }
- }
-
- protected void addGrid(Panel p, Component co, int x, int y, int w, int
fill, double wx, int anchor) {
- GridBagConstraints c= new GridBagConstraints();
- c.gridx= x; c.gridy= y;
- c.gridwidth= w;
- c.anchor= anchor;
- c.weightx= wx;
- c.fill= fill;
- if (fill == GridBagConstraints.BOTH || fill ==
GridBagConstraints.VERTICAL)
- c.weighty= 1.0;
- c.insets= new Insets(y == 0 ? GAP : 0, x == 0 ? GAP : 0, GAP,
GAP);
- p.add(co, c);
- }
-
- private void appendFailure(String kind, Test test, Throwable t) {
- kind+= ": " + test;
- String msg= t.getMessage();
- if (msg != null) {
- kind+= ":" + truncate(msg);
- }
- fFailureList.add(kind);
- fExceptions.addElement(t);
- fFailedTests.addElement(test);
- if (fFailureList.getItemCount() == 1) {
- fFailureList.select(0);
- failureSelected();
- }
- }
- /**
- * Creates the JUnit menu. Clients override this
- * method to add additional menu items.
- */
- protected Menu createJUnitMenu() {
- Menu menu= new Menu("JUnit");
- MenuItem mi= new MenuItem("About...");
- mi.addActionListener(
- new ActionListener() {
- public void actionPerformed(ActionEvent event) {
- about();
- }
- }
- );
- menu.add(mi);
-
- menu.addSeparator();
- mi= new MenuItem("Exit");
- mi.addActionListener(
- new ActionListener() {
- public void actionPerformed(ActionEvent event) {
- System.exit(0);
- }
- }
- );
- menu.add(mi);
- return menu;
- }
-
- protected void createMenus(MenuBar mb) {
- mb.add(createJUnitMenu());
- }
- protected TestResult createTestResult() {
- return new TestResult();
- }
-
- protected Frame createUI(String suiteName) {
- Frame frame= new Frame("JUnit");
- Image icon= loadFrameIcon();
- if (icon != null)
- frame.setIconImage(icon);
-
- frame.setLayout(new BorderLayout(0, 0));
- frame.setBackground(SystemColor.control);
- final Frame finalFrame= frame;
-
- frame.addWindowListener(
- new WindowAdapter() {
- public void windowClosing(WindowEvent e) {
- finalFrame.dispose();
- System.exit(0);
- }
- }
- );
-
- MenuBar mb = new MenuBar();
- createMenus(mb);
- frame.setMenuBar(mb);
-
- //---- first section
- Label suiteLabel= new Label("Test class name:");
-
- fSuiteField= new TextField(suiteName != null ? suiteName : "");
- fSuiteField.selectAll();
- fSuiteField.requestFocus();
- fSuiteField.setFont(PLAIN_FONT);
- fSuiteField.setColumns(40);
- fSuiteField.addActionListener(
- new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- runSuite();
- }
- }
- );
- fSuiteField.addTextListener(
- new TextListener() {
- public void textValueChanged(TextEvent e) {
-
fRun.setEnabled(fSuiteField.getText().length() > 0);
- fStatusLine.setText("");
- }
- }
- );
- fRun= new Button("Run");
- fRun.setEnabled(false);
- fRun.addActionListener(
- new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- runSuite();
- }
- }
- );
- boolean useLoader= useReloadingTestSuiteLoader();
- fUseLoadingRunner= new Checkbox("Reload classes every run",
useLoader);
- if (inVAJava())
- fUseLoadingRunner.setVisible(false);
-
- //---- second section
- fProgressIndicator= new ProgressBar();
-
- //---- third section
- fNumberOfErrors= new Label("0000", Label.RIGHT);
- fNumberOfErrors.setText("0");
- fNumberOfErrors.setFont(PLAIN_FONT);
-
- fNumberOfFailures= new Label("0000", Label.RIGHT);
- fNumberOfFailures.setText("0");
- fNumberOfFailures.setFont(PLAIN_FONT);
-
- fNumberOfRuns= new Label("0000", Label.RIGHT);
- fNumberOfRuns.setText("0");
- fNumberOfRuns.setFont(PLAIN_FONT);
-
- Panel numbersPanel= createCounterPanel();
-
- //---- fourth section
- Label failureLabel= new Label("Errors and Failures:");
-
- fFailureList= new List(5);
- fFailureList.addItemListener(
- new ItemListener() {
- public void itemStateChanged(ItemEvent e) {
- failureSelected();
- }
- }
- );
- fRerunButton= new Button("Run");
- fRerunButton.setEnabled(false);
- fRerunButton.addActionListener(
- new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- rerun();
- }
- }
- );
-
- Panel failedPanel= new Panel(new GridLayout(0, 1, 0, 2));
- failedPanel.add(fRerunButton);
-
- fTraceArea= new TextArea();
- fTraceArea.setRows(5);
- fTraceArea.setColumns(60);
-
- //---- fifth section
- fStatusLine= new TextField();
- fStatusLine.setFont(PLAIN_FONT);
- fStatusLine.setEditable(false);
- fStatusLine.setForeground(Color.red);
-
- fQuitButton= new Button("Exit");
- fQuitButton.addActionListener(
- new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- System.exit(0);
- }
- }
- );
-
- // ---------
- fLogo= new Logo();
-
- //---- overall layout
- Panel panel= new Panel(new GridBagLayout());
-
- addGrid(panel, suiteLabel, 0, 0, 2,
GridBagConstraints.HORIZONTAL, 1.0, GridBagConstraints.WEST);
-
- addGrid(panel, fSuiteField, 0, 1, 2,
GridBagConstraints.HORIZONTAL, 1.0, GridBagConstraints.WEST);
- addGrid(panel, fRun, 2, 1, 1,
GridBagConstraints.HORIZONTAL, 0.0, GridBagConstraints.CENTER);
- addGrid(panel, fUseLoadingRunner, 0, 2, 2,
GridBagConstraints.NONE, 1.0, GridBagConstraints.WEST);
- addGrid(panel, fProgressIndicator, 0, 3, 2,
GridBagConstraints.HORIZONTAL, 1.0, GridBagConstraints.WEST);
- addGrid(panel, fLogo, 2, 3, 1,
GridBagConstraints.NONE, 0.0, GridBagConstraints.NORTH);
-
- addGrid(panel, numbersPanel, 0, 4, 2,
GridBagConstraints.NONE, 0.0, GridBagConstraints.WEST);
-
- addGrid(panel, failureLabel, 0, 5, 2,
GridBagConstraints.HORIZONTAL, 1.0, GridBagConstraints.WEST);
- addGrid(panel, fFailureList, 0, 6, 2,
GridBagConstraints.BOTH, 1.0, GridBagConstraints.WEST);
- addGrid(panel, failedPanel, 2, 6, 1,
GridBagConstraints.HORIZONTAL, 0.0, GridBagConstraints.CENTER);
- addGrid(panel, fTraceArea, 0, 7, 2,
GridBagConstraints.BOTH, 1.0, GridBagConstraints.WEST);
-
- addGrid(panel, fStatusLine, 0, 8, 2,
GridBagConstraints.HORIZONTAL, 1.0, GridBagConstraints.CENTER);
- addGrid(panel, fQuitButton, 2, 8, 1,
GridBagConstraints.HORIZONTAL, 0.0, GridBagConstraints.CENTER);
-
- frame.add(panel, BorderLayout.CENTER);
- frame.pack();
- return frame;
- }
-
- protected Panel createCounterPanel() {
- Panel numbersPanel= new Panel(new GridBagLayout());
- addToCounterPanel(
- numbersPanel,
- new Label("Runs:"),
- 0, 0, 1, 1, 0.0, 0.0,
- GridBagConstraints.CENTER, GridBagConstraints.NONE,
- new Insets(0, 0, 0, 0)
- );
- addToCounterPanel(
- numbersPanel,
- fNumberOfRuns,
- 1, 0, 1, 1, 0.33, 0.0,
- GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL,
- new Insets(0, 8, 0, 40)
- );
- addToCounterPanel(
- numbersPanel,
- new Label("Errors:"),
- 2, 0, 1, 1, 0.0, 0.0,
- GridBagConstraints.CENTER, GridBagConstraints.NONE,
- new Insets(0, 8, 0, 0)
- );
- addToCounterPanel(
- numbersPanel,
- fNumberOfErrors,
- 3, 0, 1, 1, 0.33, 0.0,
- GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL,
- new Insets(0, 8, 0, 40)
- );
- addToCounterPanel(
- numbersPanel,
- new Label("Failures:"),
- 4, 0, 1, 1, 0.0, 0.0,
- GridBagConstraints.CENTER, GridBagConstraints.NONE,
- new Insets(0, 8, 0, 0)
- );
- addToCounterPanel(
- numbersPanel,
- fNumberOfFailures,
- 5, 0, 1, 1, 0.33, 0.0,
- GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL,
- new Insets(0, 8, 0, 0)
- );
- return numbersPanel;
- }
-
- private void addToCounterPanel(Panel counter, Component comp,
- int gridx, int gridy, int gridwidth, int gridheight,
- double weightx, double weighty,
- int anchor, int fill,
- Insets insets) {
-
- GridBagConstraints constraints= new GridBagConstraints();
- constraints.gridx= gridx;
- constraints.gridy= gridy;
- constraints.gridwidth= gridwidth;
- constraints.gridheight= gridheight;
- constraints.weightx= weightx;
- constraints.weighty= weighty;
- constraints.anchor= anchor;
- constraints.fill= fill;
- constraints.insets= insets;
- counter.add(comp, constraints);
- }
-
-
- public void failureSelected() {
- fRerunButton.setEnabled(isErrorSelected());
- showErrorTrace();
- }
-
- private boolean isErrorSelected() {
- return fFailureList.getSelectedIndex() != -1;
- }
-
- private Image loadFrameIcon() {
- Toolkit toolkit= Toolkit.getDefaultToolkit();
- try {
- java.net.URL url=
BaseTestRunner.class.getResource("smalllogo.gif");
- return toolkit.createImage((ImageProducer)
url.getContent());
- } catch (Exception ex) {
- }
- return null;
- }
-
- public Thread getRunner() {
- return fRunner;
- }
-
- public static void main(String[] args) {
- new TestRunner().start(args);
- }
-
- public static void run(Class test) {
- String args[]= { test.getName() };
- main(args);
- }
-
- public void rerun() {
- int index= fFailureList.getSelectedIndex();
- if (index == -1)
- return;
-
- Test test= (Test)fFailedTests.elementAt(index);
- rerunTest(test);
- }
-
- private void rerunTest(Test test) {
- if (!(test instanceof TestCase)) {
- showInfo("Could not reload "+ test.toString());
- return;
- }
- Test reloadedTest= null;
- TestCase rerunTest= (TestCase)test;
- try {
- Class reloadedTestClass=
getLoader().reload(test.getClass());
- reloadedTest= TestSuite.createTest(reloadedTestClass,
rerunTest.getName());
- } catch(Exception e) {
- showInfo("Could not reload "+ test.toString());
- return;
- }
- TestResult result= new TestResult();
- reloadedTest.run(result);
-
- String message= reloadedTest.toString();
- if(result.wasSuccessful())
- showInfo(message+" was successful");
- else if (result.errorCount() == 1)
- showStatus(message+" had an error");
- else
- showStatus(message+" had a failure");
- }
-
- protected void reset() {
- setLabelValue(fNumberOfErrors, 0);
- setLabelValue(fNumberOfFailures, 0);
- setLabelValue(fNumberOfRuns, 0);
- fProgressIndicator.reset();
- fRerunButton.setEnabled(false);
- fFailureList.removeAll();
- fExceptions= new Vector(10);
- fFailedTests= new Vector(10);
- fTraceArea.setText("");
-
- }
-
- protected void runFailed(String message) {
- showStatus(message);
- fRun.setLabel("Run");
- fRunner= null;
- }
-
- synchronized public void runSuite() {
- if (fRunner != null && fTestResult != null) {
- fTestResult.stop();
- } else {
- setLoading(shouldReload());
- fRun.setLabel("Stop");
- showInfo("Initializing...");
- reset();
-
- showInfo("Load Test Case...");
-
- final Test testSuite= getTest(fSuiteField.getText());
- if (testSuite != null) {
- fRunner= new Thread() {
- public void run() {
- fTestResult= createTestResult();
-
fTestResult.addListener(TestRunner.this);
-
fProgressIndicator.start(testSuite.countTestCases());
- showInfo("Running...");
-
- long startTime=
System.currentTimeMillis();
- testSuite.run(fTestResult);
-
- if (fTestResult.shouldStop()) {
- showStatus("Stopped");
- } else {
- long endTime=
System.currentTimeMillis();
- long runTime=
endTime-startTime;
- showInfo("Finished: " +
elapsedTimeAsString(runTime) + " seconds");
- }
- fTestResult= null;
- fRun.setLabel("Run");
- fRunner= null;
- System.gc();
- }
- };
- fRunner.start();
- }
- }
- }
-
- private boolean shouldReload() {
- return !inVAJava() && fUseLoadingRunner.getState();
- }
-
- private void setLabelValue(Label label, int value) {
- label.setText(Integer.toString(value));
- label.invalidate();
- label.getParent().validate();
-
- }
-
- public void setSuiteName(String suite) {
- fSuiteField.setText(suite);
- }
-
- private void showErrorTrace() {
- int index= fFailureList.getSelectedIndex();
- if (index == -1)
- return;
-
- Throwable t= (Throwable) fExceptions.elementAt(index);
- fTraceArea.setText(getFilteredTrace(t));
- }
-
-
- private void showInfo(String message) {
- fStatusLine.setFont(PLAIN_FONT);
- fStatusLine.setForeground(Color.black);
- fStatusLine.setText(message);
- }
-
- protected void clearStatus() {
- showStatus("");
- }
-
- private void showStatus(String status) {
- fStatusLine.setFont(PLAIN_FONT);
- fStatusLine.setForeground(Color.red);
- fStatusLine.setText(status);
- }
- /**
- * Starts the TestRunner
- */
- public void start(String[] args) {
- String suiteName= processArguments(args);
- fFrame= createUI(suiteName);
- fFrame.setLocation(200, 200);
- fFrame.setVisible(true);
-
- if (suiteName != null) {
- setSuiteName(suiteName);
- runSuite();
- }
- }
-}
\ No newline at end of file
Added: trunk/junit/debian/ant.properties
===================================================================
--- trunk/junit/debian/ant.properties (rev 0)
+++ trunk/junit/debian/ant.properties 2007-11-25 22:02:50 UTC (rev 4843)
@@ -0,0 +1,4 @@
+project.name=junit
+class.dir=build
+source.dir=.
+jar=junit.jar
Added: trunk/junit/debian/build.xml
===================================================================
--- trunk/junit/debian/build.xml (rev 0)
+++ trunk/junit/debian/build.xml 2007-11-25 22:02:50 UTC (rev 4843)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project default="jar" name="${project.name}" basedir="..">
+
+ <target name="clean">
+ <delete dir="${class.dir}" quiet="true"/>
+ </target>
+
+ <target name="compile" description="o Compile the source files">
+ <mkdir dir="${class.dir}"/>
+ <javac srcdir="${source.dir}" destdir="${class.dir}"
+ debug="true" source="1.5"/>
+ </target>
+
+ <target name="jar" description="o Create the jar" depends="compile">
+ <jar jarfile="${jar}">
+ <fileset dir="${class.dir}">
+ <include name="**"/>
+ </fileset>
+ </jar>
+ </target>
+
+</project>
Modified: trunk/junit/debian/changelog
===================================================================
--- trunk/junit/debian/changelog 2007-11-25 20:39:00 UTC (rev 4842)
+++ trunk/junit/debian/changelog 2007-11-25 22:02:50 UTC (rev 4843)
@@ -1,12 +1,19 @@
-junit (3.8.1.1-8) UNRELEASED; urgency=low
+junit (4.4-1) unstable; urgency=low
+ UNRELEASED
+ [ Kumar Appaiah ]
* Update the watch file. (Closes: #449640)
* debian/control:
+ Add Homepage field.
+ Add Vcs-Svn and Vcs-Browser.
-
- -- Kumar Appaiah <[EMAIL PROTECTED]> Thu, 20 Sep 2007 20:23:55 +0530
+ [ Torsten Werner ]
+ * new upstream version (Closes: #452885)
+ * Set debhelper compat level to 5.
+ * Use ant for the build process.
+
+ -- Torsten Werner <[EMAIL PROTECTED]> Sun, 25 Nov 2007 22:59:47 +0100
+
junit (3.8.1.1-7) unstable; urgency=low
* Build-Depends-Indep on java-gcj-compat-dev instead of kaffe.
Modified: trunk/junit/debian/compat
===================================================================
--- trunk/junit/debian/compat 2007-11-25 20:39:00 UTC (rev 4842)
+++ trunk/junit/debian/compat 2007-11-25 22:02:50 UTC (rev 4843)
@@ -1 +1 @@
-4
+5
Modified: trunk/junit/debian/control
===================================================================
--- trunk/junit/debian/control 2007-11-25 20:39:00 UTC (rev 4842)
+++ trunk/junit/debian/control 2007-11-25 22:02:50 UTC (rev 4843)
@@ -4,7 +4,7 @@
Maintainer: Debian Java Maintainers <[EMAIL PROTECTED]>
Uploaders: Michael Koch <[EMAIL PROTECTED]>, Wolfgang Baer <[EMAIL PROTECTED]>
Build-Depends: debhelper (>= 4.2.30), cdbs
-Build-Depends-Indep: java-gcj-compat-dev
+Build-Depends-Indep: ant, java-gcj-compat-dev
Standards-Version: 3.7.2
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/junit
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/junit
Deleted: trunk/junit/debian/dirs
===================================================================
--- trunk/junit/debian/dirs 2007-11-25 20:39:00 UTC (rev 4842)
+++ trunk/junit/debian/dirs 2007-11-25 22:02:50 UTC (rev 4843)
@@ -1,3 +0,0 @@
-usr/bin
-usr/share/java
-usr/share/ant/lib
Copied: trunk/junit/debian/junit (from rev 4842, trunk/junit/debian/junit.sh)
===================================================================
--- trunk/junit/debian/junit (rev 0)
+++ trunk/junit/debian/junit 2007-11-25 22:02:50 UTC (rev 4843)
@@ -0,0 +1,56 @@
+#!/bin/sh
+#
+# junit command line program for Debian
+# author: Takashi Okamoto <[EMAIL PROTECTED]>
+# usage:
+# junit [-text] <TestCase> output result with text.
+# This mode is default.
+# junit -awt <TestCase> output result with awt ui.
+# junit -swing <TestCase> output result with swing ui.
+
+
+TESTRUNNER=junit.textui.TestRunner
+CLASSPATH=${CLASSPATH}:/usr/share/java/junit.jar:.
+
+if [ "$#" = "0" ]; then
+ TESTRUNNER=junit.awtui.TestRunner
+fi
+
+if [ "$1" = "-text" ] ; then
+ shift;
+ if [ "$#" = "0" ] ; then
+ FLAG=false
+ fi
+elif [ "$1" = "-swing" ] ; then
+ shift;
+ TESTRUNNER=junit.swingui.TestRunner
+ if [ "$#" != "0" ]; then
+ echo "-swing option should not have other arguments"
+ exit;
+ fi
+
+elif [ "$1" = "-awt" ] ; then
+ shift
+ TESTRUNNER=junit.awtui.TestRunner
+ if [ "$#" != "0" ]; then
+ echo "-awt option should not have other arguments"
+ exit;
+ fi
+
+fi
+
+
+if [ "$1" = "-help" ] || [ "$FLAG" = "false" ] ; then
+ echo "junit 3.8.1 -- this version is modified by Takashi Okamoto <[EMAIL
PROTECTED]> for Debian."
+ echo "Usage: junit "
+ echo " -text <TestCaseName> - using text user interface."
+ echo " -awt - using awt user interface."
+ echo " -swing - using swing user interface."
+ echo "TestCaseName is the name of the TestCase class"
+ exit
+fi
+
+exec java -classpath ${CLASSPATH} ${TESTRUNNER} ${1+"$@"}
+
+
+
Deleted: trunk/junit/debian/junit-doc.docs
===================================================================
--- trunk/junit/debian/junit-doc.docs 2007-11-25 20:39:00 UTC (rev 4842)
+++ trunk/junit/debian/junit-doc.docs 2007-11-25 22:02:50 UTC (rev 4843)
@@ -1,2 +0,0 @@
-doc
-README.html
Added: trunk/junit/debian/junit.install
===================================================================
--- trunk/junit/debian/junit.install (rev 0)
+++ trunk/junit/debian/junit.install 2007-11-25 22:02:50 UTC (rev 4843)
@@ -0,0 +1 @@
+debian/junit /usr/bin/
Modified: trunk/junit/debian/junit.links
===================================================================
--- trunk/junit/debian/junit.links 2007-11-25 20:39:00 UTC (rev 4842)
+++ trunk/junit/debian/junit.links 2007-11-25 22:02:50 UTC (rev 4843)
@@ -1,2 +1 @@
-usr/share/java/junit-3.8.1.1.jar usr/share/java/junit.jar
usr/share/java/junit.jar usr/share/ant/lib/junit.jar
Copied: trunk/junit/debian/junit.manpages (from rev 4842,
trunk/junit/debian/manpages)
===================================================================
--- trunk/junit/debian/junit.manpages (rev 0)
+++ trunk/junit/debian/junit.manpages 2007-11-25 22:02:50 UTC (rev 4843)
@@ -0,0 +1 @@
+debian/junit.1
Deleted: trunk/junit/debian/junit.sh
===================================================================
--- trunk/junit/debian/junit.sh 2007-11-25 20:39:00 UTC (rev 4842)
+++ trunk/junit/debian/junit.sh 2007-11-25 22:02:50 UTC (rev 4843)
@@ -1,56 +0,0 @@
-#!/bin/sh
-#
-# junit command line program for Debian
-# author: Takashi Okamoto <[EMAIL PROTECTED]>
-# usage:
-# junit [-text] <TestCase> output result with text.
-# This mode is default.
-# junit -awt <TestCase> output result with awt ui.
-# junit -swing <TestCase> output result with swing ui.
-
-
-TESTRUNNER=junit.textui.TestRunner
-CLASSPATH=${CLASSPATH}:/usr/share/java/junit.jar:.
-
-if [ "$#" = "0" ]; then
- TESTRUNNER=junit.awtui.TestRunner
-fi
-
-if [ "$1" = "-text" ] ; then
- shift;
- if [ "$#" = "0" ] ; then
- FLAG=false
- fi
-elif [ "$1" = "-swing" ] ; then
- shift;
- TESTRUNNER=junit.swingui.TestRunner
- if [ "$#" != "0" ]; then
- echo "-swing option should not have other arguments"
- exit;
- fi
-
-elif [ "$1" = "-awt" ] ; then
- shift
- TESTRUNNER=junit.awtui.TestRunner
- if [ "$#" != "0" ]; then
- echo "-awt option should not have other arguments"
- exit;
- fi
-
-fi
-
-
-if [ "$1" = "-help" ] || [ "$FLAG" = "false" ] ; then
- echo "junit 3.8.1 -- this version is modified by Takashi Okamoto <[EMAIL
PROTECTED]> for Debian."
- echo "Usage: junit "
- echo " -text <TestCaseName> - using text user interface."
- echo " -awt - using awt user interface."
- echo " -swing - using swing user interface."
- echo "TestCaseName is the name of the TestCase class"
- exit
-fi
-
-exec java -classpath ${CLASSPATH} ${TESTRUNNER} ${1+"$@"}
-
-
-
Deleted: trunk/junit/debian/manpages
===================================================================
--- trunk/junit/debian/manpages 2007-11-25 20:39:00 UTC (rev 4842)
+++ trunk/junit/debian/manpages 2007-11-25 22:02:50 UTC (rev 4843)
@@ -1 +0,0 @@
-debian/junit.1
Added: trunk/junit/debian/orig-tar.sh
===================================================================
--- trunk/junit/debian/orig-tar.sh (rev 0)
+++ trunk/junit/debian/orig-tar.sh 2007-11-25 22:02:50 UTC (rev 4843)
@@ -0,0 +1,20 @@
+#!/bin/sh -e
+
+# called by uscan with '--upstream-version' <version> <file>
+DIR=junit-$2
+TAR=../junit_$2.orig.tar.gz
+
+# clean up the upstream tarball
+mkdir $DIR
+(cd $DIR && jar -x -f ../$3)
+tar -c -z -f $TAR $DIR
+rm -rf $DIR $3
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+ . .svn/deb-layout
+ mv $TAR $origDir
+ echo "moved $TAR to $origDir"
+fi
+
+exit 0
Property changes on: trunk/junit/debian/orig-tar.sh
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/junit/debian/rules
===================================================================
--- trunk/junit/debian/rules 2007-11-25 20:39:00 UTC (rev 4842)
+++ trunk/junit/debian/rules 2007-11-25 22:02:50 UTC (rev 4843)
@@ -3,37 +3,14 @@
# build file for junit uses cdbs
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
-JAVA_HOME := /usr/lib/jvm/java-gcj
+JAVA_HOME := /usr/lib/jvm/java-gcj
+DEB_ANT_BUILDFILE := debian/build.xml
-JAVAC = $(JAVA_HOME)/bin/javac
-JAR = $(JAVA_HOME)/bin/jar
-CLASSPATH = .
-JAVADOC = $(JAVA_HOME)/bin/javadoc
-JARNAME = junit.jar
-
-UPSTREAM_VERSION=$(shell echo $(DEB_VERSION) | cut -d- -f1)
-
-build:
- (mkdir src; cd src; ${JAR} xvf ../src.jar)
- (rm src/junit/swingui/*.java; cp debian/TestRunner.java
src/junit/swingui)
- patch -p0 < debian/AboutDialog.java.diff
-
- (cd src;${JAVAC} -target 1.3 -classpath ${CLASSPATH} -d ../classes
junit/*/*.java)
- cp -r src/junit/swingui/icons classes/junit/swingui
- cp src/junit/runner/*.gif classes/junit/runner
- cp src/junit/runner/excluded.properties classes/junit/runner
- (${JAR} cvf ${JARNAME} -C classes junit)
- # build the api with gjdoc
- mkdir -p doc/api
- (cd src;${JAVADOC} -d ../doc/api junit.framework junit.awtui
junit.swingui junit.runner junit.textui junit.extensions)
-
-clean::
- -rm -rf classes doc/api ${JARNAME}
- -rm -f `find . -name "*~"`
- -rm -rf src
-
install/junit::
- -rm -f javadoc/package-list
- install -m 644 ${JARNAME}
debian/junit/usr/share/java/junit-${UPSTREAM_VERSION}.jar
- install -m 755 debian/junit.sh debian/junit/usr/bin/junit
+ install -m 644 -D junit.jar
debian/junit/usr/share/java/junit-${DEB_UPSTREAM_VERSION}.jar
+ dh_link -pjunit /usr/share/java/junit-${DEB_UPSTREAM_VERSION}.jar
/usr/share/java/junit.jar
+
+get-orig-source::
+ -uscan --upstream-version 0 --rename
Modified: trunk/junit/debian/watch
===================================================================
--- trunk/junit/debian/watch 2007-11-25 20:39:00 UTC (rev 4842)
+++ trunk/junit/debian/watch 2007-11-25 22:02:50 UTC (rev 4843)
@@ -1,4 +1,4 @@
version=3
http://heanet.dl.sourceforge.net/sourceforge/junit/ \
-junit-([\d\.]+)-src.jar debian uupdate
+junit-([\d\.]+)-src.jar debian debian/orig-tar.sh
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
