diff --git a/.gitignore b/.gitignore index 6876a7c..32f2c9b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1 @@ /Mars_4_1.jar -/Mars4_3.jar -/Mars4_4.jar -/Mars4_5.jar diff --git a/Mars b/Mars index ddea40a..389042b 100644 --- a/Mars +++ b/Mars @@ -1,23 +1,5 @@ #!/bin/sh -# -# Mars script -# JPackage Project -# Source functions library -_prefer_jre="true" . /usr/share/java-utils/java-functions -# Configuration -MAIN_CLASS="Mars" -BASE_FLAGS="-Dswing.aatext=true -Dawt.useSystemAAFontSettings=on" -BASE_OPTIONS="" -BASE_JARS="Mars" - -# Set parameters -set_jvm -set_classpath $BASE_JARS -set_flags $BASE_FLAGS -set_options $BASE_OPTIONS - -# Let's start -run "$@" +_JAVA_OPTIONS="-Dswing.aatext=true -Dawt.useSystemAAFontSettings=on" java -jar /usr/share/java/Mars.jar diff --git a/Mars.spec b/Mars.spec index af4f97b..161bc6f 100644 --- a/Mars.spec +++ b/Mars.spec @@ -1,22 +1,23 @@ Name: Mars -Version: 4.5 -Release: 33%{?dist} +Version: 4.1 +Release: 3%{?dist} Summary: An interactive development environment for programming in MIPS assembly language +Group: Development/Tools License: MIT -URL: https://dpetersanderson.github.io/ -Source0: https://github.com/dpetersanderson/MARS/releases/download/v.4.5.1/Mars4_5.jar +URL: http://courses.missouristate.edu/KenVollmar/MARS/ +Source0: http://courses.missouristate.edu/KenVollmar/MARS/MARS_4_1_Jan_2011/Mars_4_1.jar Source1: Mars Source2: Mars.desktop -Source3: build.xml +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -ExclusiveArch: %{java_arches} noarch -BuildRequires: ant-openjdk25 -BuildRequires: java-25-devel +BuildRequires: java-devel +BuildRequires: jpackage-utils BuildRequires: desktop-file-utils -Requires: java-25 +Requires: java >= 1:1.6.0 +Requires: jpackage-utils %description MARS is a lightweight interactive development environment (IDE) for @@ -24,151 +25,41 @@ programming in MIPS assembly language, intended for educational-level use with Patterson and Hennessy's Computer Organization and Design. %prep -%setup -q -c %{name}-%{version} +%setup -q -c Mars-%{version} -find . -name '*.jar' -exec rm -f '{}' \; -find . -name '*.class' -exec rm -f '{}' \; +find -name '*.class' -exec rm -f '{}' \; %build sed -i 's/\r//' MARSlicense.txt -cp -p %{SOURCE3} build.xml -ant +cat << EOF > META-INF/MANIFEST.MF +Manifest-Version: 1.0 +Main-Class: Mars +EOF + +find . -name "*.java" -exec javac '{}' \; +jar cmf META-INF/MANIFEST.MF Mars.jar PseudoOps.txt Config.properties Syscall.properties Settings.properties MARSlicense.txt mainclass.txt CreateMarsJar.bat Mars.java Mars.class docs help images mars %install -install -Dpm 644 %{name}.jar ${RPM_BUILD_ROOT}%{_javadir}/%{name}.jar -install -Dpm 755 %{SOURCE1} ${RPM_BUILD_ROOT}%{_bindir}/%{name} +rm -rf $RPM_BUILD_ROOT +install -Dpm 644 Mars.jar ${RPM_BUILD_ROOT}%{_javadir}/Mars.jar +install -Dpm 755 %{SOURCE1} ${RPM_BUILD_ROOT}%{_bindir}/Mars desktop-file-install \ --add-category="Development" \ --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \ %{SOURCE2} +%clean +rm -rf $RPM_BUILD_ROOT + %files -%{_javadir}/%{name}.jar -%{_bindir}/%{name} +%defattr(-,root,root,-) +%{_javadir}/* +%{_bindir}/* %{_datadir}/applications/Mars.desktop %doc MARSlicense.txt %changelog -* Fri Jan 16 2026 Fedora Release Engineering - 4.5-33 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Mon Jul 28 2025 jiri vanek - 4.5-32 -- Rebuilt for java-25-openjdk as preffered jdk - -* Wed Jul 23 2025 Fedora Release Engineering - 4.5-31 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Thu Jan 16 2025 Fedora Release Engineering - 4.5-30 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Jan 01 2025 W. Michael Petullo - 4.5-29 -- Adjust to Mars moving to GitHub - -* Wed Jul 17 2024 Fedora Release Engineering - 4.5-28 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Wed May 22 2024 Marian Koncek - 4.5-27 -- Use system Java version - -* Tue Feb 27 2024 Jiri Vanek - 4.5-26 -- Rebuilt for java-21-openjdk as system jdk - -* Mon Jan 22 2024 Fedora Release Engineering - 4.5-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 4.5-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Jul 19 2023 Fedora Release Engineering - 4.5-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Mon Jul 17 2023 W. Michael Petullo - 4.5-22 -- Remove jpackage-utils requirement; it is retired and not needed - -* Wed Jan 18 2023 Fedora Release Engineering - 4.5-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Aug 18 2022 W. Michael PEtullo - 4.5-20 -- Build using Java 17 - -* Wed Jul 20 2022 Fedora Release Engineering - 4.5-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jul 08 2022 Jiri Vanek - 4.5-18 -- Rebuilt for Drop i686 JDKs - -* Sat Feb 05 2022 Jiri Vanek - 4.5-17 -- Rebuilt for java-17-openjdk as system jdk - -* Wed Jan 19 2022 Fedora Release Engineering - 4.5-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 4.5-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon Jan 25 2021 Fedora Release Engineering - 4.5-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 4.5-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Sat Jul 11 2020 Jiri Vanek - 4.5-12 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Tue Jan 28 2020 Fedora Release Engineering - 4.5-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Jul 24 2019 Fedora Release Engineering - 4.5-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jan 31 2019 Fedora Release Engineering - 4.5-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Oct 05 2018 W. Michael Petullo - 4.5-8 -- Fix BZ #1634466 by requiring java-1.8.0-openjdk - -* Thu Jul 12 2018 Fedora Release Engineering - 4.5-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 4.5-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 4.5-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 4.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Feb 03 2016 Fedora Release Engineering - 4.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Jun 16 2015 Fedora Release Engineering - 4.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat May 30 2015 Scott Tsai - 4.5-1 -- Upstream 4.5 - -* Fri Jun 06 2014 Fedora Release Engineering - 4.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri Aug 02 2013 Fedora Release Engineering - 4.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Mon Jun 24 2013 Mat Booth - 4.3-1 -- Fix class not found exceptions at startup, rhbz#828973 -- Also update to latest upstream -- Write a real build script to create the jar - -* Wed Feb 13 2013 Fedora Release Engineering - 4.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Jul 18 2012 Fedora Release Engineering - 4.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Jan 12 2012 Fedora Release Engineering - 4.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - * Sun Mar 06 2011 W. Michael Petullo - 4.1-3 - Ensure proper end of line encoding in MARSlicense.txt - Add rm -rf $RPM_BUILD_ROOT diff --git a/build.xml b/build.xml deleted file mode 100644 index 6f14f3b..0000000 --- a/build.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/sources b/sources index c3445c8..4e4957d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4709fae736e6c9d4078ea4b21e0be1e9 Mars4_5.jar +a439e6114c3746f59ce5f0a95189f9c5 Mars_4_1.jar