BDC/diy-layout-creator
2
0
Fork 0
mirror of https://github.com/bancika/diy-layout-creator synced 2026-11-10 17:22:09 +10:00
Code Issues Packages Projects Releases Wiki Activity

fix mavenized

Browse Source
This commit is contained in:
Branislav Stojkovic
2025-03-11 15:03:46 +01:00
parent 344e85e6f7
commit 83b1e02086
3 changed files with 38 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diylc/diylc-swing/deploy/linux/run.sh
+5 -2
View File
@@ -1,2 +1,5 @@
#!/bin/bash #!/usr/bin/env bash
exec java -Xms512m -Xmx4096m -javaagent:lib/jar-loader.jar -Dorg.diylc.scriptRun=true -Dfile.encoding=UTF-8 -cp diylc.jar:lib --add-exports java.desktop/com.apple.eawt.event=ALL-UNNAMED --add-exports java.desktop/com.apple.eio=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.text=ALL-UNNAMED --add-opens java.desktop/java.awt=ALL-UNNAMED --add-opens java.desktop/java.awt.font=ALL-UNNAMED --add-opens java.desktop/java.awt.geom=ALL-UNNAMED org.diylc.DIYLCStarter "$@" JAVA_BIN="$(which java)"
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
CLASS_PATH="${DIR}/diylc.jar"
exec java -Xms512m -Xmx4096m -Dorg.diylc.scriptRun=true -Dfile.encoding=UTF-8 -cp "$CLASS_PATH" --add-exports java.desktop/com.apple.eawt.event=ALL-UNNAMED --add-exports java.desktop/com.apple.eio=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.text=ALL-UNNAMED --add-opens java.desktop/java.awt=ALL-UNNAMED --add-opens java.desktop/java.awt.font=ALL-UNNAMED --add-opens java.desktop/java.awt.geom=ALL-UNNAMED org.diylc.DIYLCStarter "$@"
diylc/diylc-swing/pom.xml
+33 -5
View File
@@ -124,11 +124,6 @@
<artifactId>gerber-writer-api-1.0.0</artifactId> <artifactId>gerber-writer-api-1.0.0</artifactId>
<version>1.0</version> <version>1.0</version>
</dependency> </dependency>
<dependency>
<groupId>org.diylc.local</groupId>
<artifactId>jar-loader</artifactId>
<version>1.0</version>
</dependency>
<dependency> <dependency>
<groupId>org.diylc.local</groupId> <groupId>org.diylc.local</groupId>
<artifactId>java-http-proxy</artifactId> <artifactId>java-http-proxy</artifactId>
@@ -187,4 +182,37 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<profiles>
<profile>
<id>linux-zip</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.5.0</version>
<configuration>
<descriptors>
<descriptor>deploy/linux/linux-zip.xml</descriptor>
</descriptors>
</configuration>
<executions>
<execution>
<id>make-assembly</id>
<configuration>
<finalName>diylc-${project.version}</finalName>
<appendAssemblyId>false</appendAssemblyId>>
</configuration>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project> </project>
diylc/diylc-swing/src/main/java/org/diylc/DIYLCStarter.java
-4
View File
@@ -35,7 +35,6 @@ import org.diylc.appframework.miscutils.Utils;
import org.diylc.swingframework.export.DrawingExporter; import org.diylc.swingframework.export.DrawingExporter;
import org.diylc.swingframework.fonts.FontOptimizer; import org.diylc.swingframework.fonts.FontOptimizer;
import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.XStream;
import ca.cgjennings.jvm.JarLoader;
import org.diylc.common.IPlugInPort; import org.diylc.common.IPlugInPort;
import org.diylc.core.IView; import org.diylc.core.IView;
import org.diylc.lang.LangUtil; import org.diylc.lang.LangUtil;
@@ -61,7 +60,6 @@ public class DIYLCStarter {
/** /**
* @param args * @param args
* @throws InvalidActivityException
*/ */
public static void main(String[] args) { public static void main(String[] args) {
try { try {
@@ -106,8 +104,6 @@ public class DIYLCStarter {
// disable HIGHLIGHT_CONTINUITY_AREA config, keep it transient // disable HIGHLIGHT_CONTINUITY_AREA config, keep it transient
ConfigurationManager.getInstance().writeValue(IPlugInPort.HIGHLIGHT_CONTINUITY_AREA, false); ConfigurationManager.getInstance().writeValue(IPlugInPort.HIGHLIGHT_CONTINUITY_AREA, false);
LOG.info("JarLoader strategy: " + JarLoader.getStrategy());
LOG.info("Loading languages..."); LOG.info("Loading languages...");
LangUtil.configure(); LangUtil.configure();