6502/kickc
1
0
Fork 0
mirror of https://gitlab.com/camelot/kickc.git synced 2024-06-02 00:41:42 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into master-libraries

Browse Source
This commit is contained in:
Sven Van de Velde 2023-11-27 15:47:50 +01:00
commit 4012887479
11 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
repo/cml/kickass/kickassembler/5.25-65ce02/kickassembler-5.25-65ce02.jar Normal file
View File

Binary file not shown.

1
repo/cml/kickass/kickassembler/5.25-65ce02/kickassembler-5.25-65ce02.jar.md5 Normal file
View File

@ -0,0 +1 @@
9c89720b38b42cf93f12706ae83e9b20

1
repo/cml/kickass/kickassembler/5.25-65ce02/kickassembler-5.25-65ce02.jar.sha1 Normal file
View File

@ -0,0 +1 @@
02694dbecf31df6a537f8c92db9408f7d1ded309

9
repo/cml/kickass/kickassembler/5.25-65ce02/kickassembler-5.25-65ce02.pom Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>cml.kickass</groupId>
<artifactId>kickassembler</artifactId>
<version>5.25-65ce02</version>
<description>POM was created from install:install-file</description>
</project>

1
repo/cml/kickass/kickassembler/5.25-65ce02/kickassembler-5.25-65ce02.pom.md5 Normal file
View File

@ -0,0 +1 @@
ed253e65ce35f7794d81063c784b48fb

1
repo/cml/kickass/kickassembler/5.25-65ce02/kickassembler-5.25-65ce02.pom.sha1 Normal file
View File

@ -0,0 +1 @@
bd993bd0412662be321ce9eaa585930d72ac1a5a

5
repo/cml/kickass/kickassembler/maven-metadata.xml
View File

@ -3,7 +3,7 @@
<groupId>cml.kickass</groupId>
<artifactId>kickassembler</artifactId>
<versioning>
<release>5.24-65ce02.e</release>
<release>5.25-65ce02</release>
<versions>
<version>4.19</version>
<version>5.7</version>
@ -32,7 +32,8 @@
<version>5.24-65ce02.c</version>
<version>5.24-65ce02.d</version>
<version>5.24-65ce02.e</version>
<version>5.25-65ce02</version>
</versions>
<lastUpdated>20220213212400</lastUpdated>
<lastUpdated>20230903123547</lastUpdated>
</versioning>
</metadata>

2
repo/cml/kickass/kickassembler/maven-metadata.xml.md5
View File

@ -1 +1 @@
12dc7c134f8dcf276f4031702b11b5d7
00f25e67b07c7f1ac00cbc0b4215a1ff

2
repo/cml/kickass/kickassembler/maven-metadata.xml.sha1
View File

@ -1 +1 @@
8cc20999d0045eea75ba3fff20b93c212b7cc52a
7a2cfffa2bdf31ea981460383800255457119a53

23
src/main/java/dk/camelot64/kickc/KickC.java
View File

@ -519,25 +519,34 @@ public class KickC implements Callable<Integer> {
// Execute the binary file if instructed
if(emulator != null) {
List<String> emulatorCommand = new ArrayList<>();
emulatorCommand.addAll(Arrays.asList(emulator.split(" ")));
// Find commandline options for the emulator
String emuOptions = "";
if(emulator.equals("C64Debugger")) {
if( emulator.equals("C64Debugger") ) {
Path viceSymbolsPath = program.getOutputFileManager().getOutputFile("vs");
emuOptions = "-symbols " + viceSymbolsPath + " -autojmp -prg ";
emulatorCommand.add("-symbol");
emulatorCommand.add(viceSymbolsPath.toString());
emulatorCommand.add("-autojmp");
emulatorCommand.add("-prg");
}
// The program names used by VICE emulators
List<String> viceEmus = Arrays.asList("x64", "x64sc", "x128", "x64dtv", "xcbm2", "xcbm5x0", "xpet", "xplus4", "xscpu64", "xvic");
if(viceEmus.contains(emulator)) {
Path viceSymbolsPath = program.getOutputFileManager().getOutputFile("vs");
emuOptions = "-moncommands " + viceSymbolsPath.toAbsolutePath().toString() + " ";
emulatorCommand.add("-moncommands");
emulatorCommand.add(viceSymbolsPath.toAbsolutePath().toString());
}
emulatorCommand.add(outputBinaryFilePath.toAbsolutePath().toString());
System.out.println("Executing " + outputBinaryFilePath + " using " + emulator);
String executeCommand = emulator + " " + emuOptions + outputBinaryFilePath.toAbsolutePath().toString();
if(verbose) {
System.out.println("Executing command: " + executeCommand);
System.out.println("Executing command: " + String.join(" ", emulatorCommand));
}
try {
Process process = Runtime.getRuntime().exec(executeCommand);
ProcessBuilder processBuilder = new ProcessBuilder();
processBuilder.command(emulatorCommand);
processBuilder.inheritIO();
Process process = processBuilder.start();
process.waitFor();
} catch(Throwable e) {
System.err.println("Executing emulator failed! " + e.getMessage());

4
src/main/repo/mvn-repo-install-kickass.sh
View File

@ -4,7 +4,7 @@
cp ./repo/cml/kickass/kickassembler/maven-metadata.xml ./repo/cml/kickass/kickassembler/maven-metadata-local.xml
# mvn install:install-file -Dmaven.repo.local=./repo/ -Dfile=/Applications/KickAssembler/KickAss.jar -DgroupId=cml.kickass -DartifactId=kickassembler -Dpackaging=jar -DgeneratePom=true -DcreateChecksum=true -Dversion=5.16
mvn install:install-file -Dmaven.repo.local=./repo/ -Dfile=/Users/jespergravgaard/c64/kickassembler65ce02/out/KickAss65CE02.jar -DgroupId=cml.kickass -DartifactId=kickassembler -Dpackaging=jar -DgeneratePom=true -DcreateChecksum=true -Dversion=5.24-65ce02.e
mvn install:install-file -Dmaven.repo.local=./repo/ -Dfile=/Users/jespergravgaard/c64/kickassembler65ce02/out/KickAss65CE02.jar -DgroupId=cml.kickass -DartifactId=kickassembler -Dpackaging=jar -DgeneratePom=true -DcreateChecksum=true -Dversion=5.25-65ce02
# Finalize by making the local metadata official
pushd ./repo/cml/kickass/kickassembler
@ -12,7 +12,7 @@ mv maven-metadata-local.xml maven-metadata.xml
mv maven-metadata-local.xml.md5 maven-metadata.xml.md5
mv maven-metadata-local.xml.sha1 maven-metadata.xml.sha1
popd
]
# Remove stuff that Maven adds, that we don't need
rm -rf ./repo/classworlds
rm -rf ./repo/junit