From ddb02c71979ceb30cee738dca574ba50356ebbb6 Mon Sep 17 00:00:00 2001 From: Mohamed El Morabity Date: Dec 22 2011 01:54:56 +0000 Subject: - Add jgoodies-common jar in the launcher classpath - Fix compilation with JGoodies Common 1.4.2 - Spec cleanup --- diff --git a/antlrworks-1.4-jgoodies-forms_1.4.2.patch b/antlrworks-1.4-jgoodies-forms_1.4.2.patch new file mode 100644 index 0000000..feb26a7 --- /dev/null +++ b/antlrworks-1.4-jgoodies-forms_1.4.2.patch @@ -0,0 +1,100 @@ +diff -up ./src/aw/org/antlr/works/dialog/AWPrefsDialog.java.orig ./src/aw/org/antlr/works/dialog/AWPrefsDialog.java +--- ./src/aw/org/antlr/works/dialog/AWPrefsDialog.java.orig 2010-05-09 21:50:20.000000000 +0200 ++++ ./src/aw/org/antlr/works/dialog/AWPrefsDialog.java 2011-12-22 01:23:32.387503874 +0100 +@@ -588,11 +588,11 @@ public class AWPrefsDialog extends XJPan + FormFactory.LABEL_COMPONENT_GAP_COLSPEC, + new ColumnSpec(ColumnSpec.RIGHT, Sizes.DEFAULT, FormSpec.NO_GROW), + FormFactory.LABEL_COMPONENT_GAP_COLSPEC, +- new ColumnSpec("max(min;20dlu)"), ++ ColumnSpec.decode("max(min;20dlu)"), + FormFactory.LABEL_COMPONENT_GAP_COLSPEC, + new ColumnSpec(ColumnSpec.FILL, Sizes.DEFAULT, FormSpec.DEFAULT_GROW), + FormFactory.LABEL_COMPONENT_GAP_COLSPEC, +- new ColumnSpec("max(min;40dlu)"), ++ ColumnSpec.decode("max(min;40dlu)"), + FormFactory.LABEL_COMPONENT_GAP_COLSPEC, + new ColumnSpec(Sizes.dluX(10)) + }, +@@ -685,7 +685,7 @@ public class AWPrefsDialog extends XJPan + FormFactory.LABEL_COMPONENT_GAP_COLSPEC, + new ColumnSpec(Sizes.dluX(20)), + FormFactory.LABEL_COMPONENT_GAP_COLSPEC, +- new ColumnSpec("max(default;45dlu)"), ++ ColumnSpec.decode("max(default;45dlu)"), + FormFactory.LABEL_COMPONENT_GAP_COLSPEC, + new ColumnSpec(Sizes.dluX(20)), + FormFactory.LABEL_COMPONENT_GAP_COLSPEC, +@@ -1131,7 +1131,7 @@ public class AWPrefsDialog extends XJPan + FormFactory.LABEL_COMPONENT_GAP_COLSPEC, + new ColumnSpec(ColumnSpec.RIGHT, Sizes.DEFAULT, FormSpec.NO_GROW), + FormFactory.LABEL_COMPONENT_GAP_COLSPEC, +- new ColumnSpec("max(default;20dlu)"), ++ ColumnSpec.decode("max(default;20dlu)"), + FormFactory.LABEL_COMPONENT_GAP_COLSPEC, + FormFactory.DEFAULT_COLSPEC, + FormFactory.LABEL_COMPONENT_GAP_COLSPEC, +diff -up ./src/aw/org/antlr/works/dialog/DialogAbout.java.orig ./src/aw/org/antlr/works/dialog/DialogAbout.java +--- ./src/aw/org/antlr/works/dialog/DialogAbout.java.orig 2010-05-09 21:50:20.000000000 +0200 ++++ ./src/aw/org/antlr/works/dialog/DialogAbout.java 2011-12-22 01:23:32.425502276 +0100 +@@ -165,13 +165,13 @@ public class DialogAbout extends XJPanel + FormFactory.LINE_GAP_ROWSPEC, + new RowSpec(RowSpec.BOTTOM, Sizes.DEFAULT, FormSpec.NO_GROW), + FormFactory.LINE_GAP_ROWSPEC, +- new RowSpec("top:max(default;15dlu)"), ++ RowSpec.decode("top:max(default;15dlu)"), + FormFactory.LINE_GAP_ROWSPEC, +- new RowSpec("bottom:max(default;10dlu)"), ++ RowSpec.decode("bottom:max(default;10dlu)"), + FormFactory.LINE_GAP_ROWSPEC, +- new RowSpec("top:max(default;10dlu)"), ++ RowSpec.decode("top:max(default;10dlu)"), + FormFactory.LINE_GAP_ROWSPEC, +- new RowSpec("fill:max(default;60dlu):grow"), ++ RowSpec.decode("fill:max(default;60dlu):grow"), + FormFactory.LINE_GAP_ROWSPEC, + new RowSpec(Sizes.dluY(10)) + })); +diff -up ./src/aw/org/antlr/works/dialog/DialogGenerate.java.orig ./src/aw/org/antlr/works/dialog/DialogGenerate.java +--- ./src/aw/org/antlr/works/dialog/DialogGenerate.java.orig 2010-05-09 21:50:20.000000000 +0200 ++++ ./src/aw/org/antlr/works/dialog/DialogGenerate.java 2011-12-22 01:23:32.368504674 +0100 +@@ -128,7 +128,7 @@ public class DialogGenerate extends XJDi + new ColumnSpec[] { + FormFactory.DEFAULT_COLSPEC, + FormFactory.LABEL_COMPONENT_GAP_COLSPEC, +- new ColumnSpec("max(min;200dlu):grow"), ++ ColumnSpec.decode("max(min;200dlu):grow"), + FormFactory.LABEL_COMPONENT_GAP_COLSPEC, + FormFactory.DEFAULT_COLSPEC + }, +diff -up ./src/aw/org/antlr/works/dialog/DialogPersonalInfo.java.orig ./src/aw/org/antlr/works/dialog/DialogPersonalInfo.java +--- ./src/aw/org/antlr/works/dialog/DialogPersonalInfo.java.orig 2010-05-09 21:50:20.000000000 +0200 ++++ ./src/aw/org/antlr/works/dialog/DialogPersonalInfo.java 2011-12-22 01:23:32.413502780 +0100 +@@ -162,9 +162,9 @@ public class DialogPersonalInfo extends + FormFactory.LABEL_COMPONENT_GAP_COLSPEC, + new ColumnSpec(Sizes.dluX(50)), + FormFactory.LABEL_COMPONENT_GAP_COLSPEC, +- new ColumnSpec("max(min;100dlu):grow"), ++ ColumnSpec.decode("max(min;100dlu):grow"), + FormFactory.LABEL_COMPONENT_GAP_COLSPEC, +- new ColumnSpec("max(default;30dlu)"), ++ ColumnSpec.decode("max(default;30dlu)"), + FormFactory.LABEL_COMPONENT_GAP_COLSPEC, + FormFactory.DEFAULT_COLSPEC + }, +diff -up ./src/aw/org/antlr/works/dialog/DialogReports.java.orig ./src/aw/org/antlr/works/dialog/DialogReports.java +--- ./src/aw/org/antlr/works/dialog/DialogReports.java.orig 2010-05-09 21:50:20.000000000 +0200 ++++ ./src/aw/org/antlr/works/dialog/DialogReports.java 2011-12-22 01:23:32.398503412 +0100 +@@ -330,11 +330,11 @@ public class DialogReports extends XJDia + new ColumnSpec[] { + FormFactory.DEFAULT_COLSPEC, + FormFactory.LABEL_COMPONENT_GAP_COLSPEC, +- new ColumnSpec("max(min;30dlu)"), ++ ColumnSpec.decode("max(min;30dlu)"), + FormFactory.LABEL_COMPONENT_GAP_COLSPEC, + FormFactory.RELATED_GAP_COLSPEC, + FormFactory.LABEL_COMPONENT_GAP_COLSPEC, +- new ColumnSpec("max(min;30dlu):grow"), ++ ColumnSpec.decode("max(min;30dlu):grow"), + FormFactory.LABEL_COMPONENT_GAP_COLSPEC, + new ColumnSpec(ColumnSpec.FILL, Sizes.DEFAULT, FormSpec.DEFAULT_GROW) + }, diff --git a/antlrworks.sh b/antlrworks.sh deleted file mode 100644 index aa9b634..0000000 --- a/antlrworks.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -# Source functions library -if [ -f /usr/share/java-utils/java-functions ] ; then - . /usr/share/java-utils/java-functions -else - echo "Can't find functions library, aborting" - exit 1 -fi - -# Configuration -MAIN_CLASS="org.antlr.works.IDE" -BASE_FLAGS="-Xmx400m" -BASE_JARS="antlrworks antlr antlr3 antlr3-runtime jgoodies-forms stringtemplate" - -# Set parameters -set_jvm -set_classpath $BASE_JARS -set_flags $BASE_FLAGS - -# Let's start -run "$@" diff --git a/antlrworks.spec b/antlrworks.spec index aa8a57a..f781a93 100644 --- a/antlrworks.spec +++ b/antlrworks.spec @@ -1,29 +1,31 @@ Name: antlrworks Version: 1.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Grammar development environment for ANTLR v3 grammars Group: Development/Tools License: BSD URL: http://www.antlr.org/works Source0: http://www.antlr.org/download/%{name}-%{version}-src.zip -Source1: antlrworks.sh -Source2: antlrworks.desktop -# Disable embedding of dependency jars file into antlrworks jar file +Source1: antlrworks.desktop +# Disable embedding of dependency jars files into antlrworks jar file Patch0: antlrworks-1.4-build.patch # Add xdg-open and epiphany as available web browsers to open help (sent # upstream) Patch1: antlrworks-1.4-browsers.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# Fix compilation with JGoodies Forms 1.4.2 +Patch2: antlrworks-1.4-jgoodies-forms_1.4.2.patch BuildRequires: ant BuildRequires: antlr3-tool BuildRequires: desktop-file-utils +BuildRequires: java-devel >= 1:1.6.0 BuildRequires: jgoodies-forms Requires: antlr3-tool Requires: graphviz # Owns /usr/share/icons/hicolor Requires: hicolor-icon-theme +# Antlrworks requires javac Requires: java-devel >= 1:1.6.0 Requires: jgoodies-forms BuildArch: noarch @@ -47,25 +49,25 @@ encountered by grammar developers. %setup -q -c %patch0 -p0 -b .build %patch1 -p1 -b .browsers +%patch2 -p0 -b .jgoodies-forms_1.4.2 find -name '*.class' -o -name '*.jar' -exec rm '{}' \; %build -export CLASSPATH=$(build-classpath antlr antlr3 antlr3-runtime jgoodies-forms stringtemplate) +export CLASSPATH=$(build-classpath antlr antlr3 antlr3-runtime jgoodies-common jgoodies-forms stringtemplate) ant build %install -rm -rf $RPM_BUILD_ROOT install -Dpm 0644 dist/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar -install -Dpm 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name} +%jpackage_script org.antlr.works.IDE "-Xmx400m" "" antlrworks:antlr:antlr3:antlr3-runtime:jgoodies-common:jgoodies-forms:stringtemplate %{name} true desktop-file-install \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ - %{SOURCE2} + %{SOURCE1} install -Dpm 0644 resources/icons/app.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps/%{name}.png for i in 16 32 64; do @@ -75,10 +77,6 @@ done desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop -%clean -rm -rf $RPM_BUILD_ROOT - - %post touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : @@ -103,6 +101,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Wed Dec 21 2011 Mohamed El Morabity - 1.4-6 +- Add jgoodies-common jar in the launcher classpath +- Fix compilation with JGoodies Common 1.4.2 +- Spec cleanup + * Mon Feb 07 2011 Fedora Release Engineering - 1.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild