From 03b69d0e3c9e8b1c1c5f0e473273f2e975186ea1 Mon Sep 17 00:00:00 2001
From: Hunter0x7c7 <1125607007@qq.com>
Date: 星期五, 11 八月 2023 13:37:58 +0800
Subject: [PATCH] commit
---
.idea/.gitignore | 8 ++++++++
pom.xml | 29 ++++++++++++++++++-----------
.gitignore2 | 5 +++++
3 files changed, 31 insertions(+), 11 deletions(-)
diff --git a/.gitignore2 b/.gitignore2
new file mode 100644
index 0000000..e6e0911
--- /dev/null
+++ b/.gitignore2
@@ -0,0 +1,5 @@
+.idea/
+out/
+target/
+
+*.iml
\ No newline at end of file
diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..6f87748
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# Default ignored files
+/workspace.xml
+
+.idea/
+out/
+target/
+
+*.iml
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 7917d4e..f507727 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,8 +78,9 @@
</additionalModules>
<!-- 绮剧畝鐗坖re -->
<bundleJre>true</bundleJre>
- <!-- 缁戝畾鑷畾涔塉RE璺緞-->
- <jrePath>D:\Develop\Java\jdk-9.0.1\jre</jrePath>
+ <!-- 缁戝畾鑷畾涔塉RE璺緞 -->
+ <!--<jrePath>D:\Develop\Java\jdk-9.0.1\jre</jrePath>-->
+ <jrePath>/Library/Java/JavaVirtualMachines/jdk1.8.0_101.jdk/Contents/Home/jre</jrePath>
<!-- 鐢熸垚瀹夎鍖� -->
<generateInstaller>false</generateInstaller>
<!-- 涓嶄娇鐢ㄧ鐞嗗憳韬唤鎵撳紑绋嬪簭 -->
@@ -87,10 +88,11 @@
<!-- 灏嗘寚瀹氭枃浠跺す鍖呭惈鍒扮敓鎴愮殑绋嬪簭璺緞 -->
<!-- 鎵嬪姩寮曞叆棰濆璧勬簮-->
<additionalResources>
- <additionalResource>F:\workspace_java\JavaFx\SyncTools\libs</additionalResource>
- </additionalResources>
- <!-- 褰撳墠鎵撳寘鐨勫钩鍙� -->
- <platform>windows</platform>
+ <!--<additionalResource>F:\workspace_java\JavaFx\SyncTools\libs</additionalResource>-->
+ <additionalResource>/Users/hunter/workspace/JavaFx/SyncTools/lib</additionalResource>
+ </additionalResources>
+ <!-- 褰撳墠鎵撳寘鐨勫钩鍙� -->
+ <platform>mac</platform>
<name>SyncToolsV1.0.1</name>
<!-- exe 鍚嶇О锛岄�氳繃寮曠敤鐨勬柟寮� -->
<displayName>${project.name}</displayName>
@@ -100,17 +102,21 @@
<vmArg>-Dfile.encoding=GBK</vmArg><!-- 瑙ｅ喅鎵撳寘涔嬪悗鎵樼洏涔辩爜 -->
</vmArgs>
<!-- 鐗瑰畾骞冲彴鍙傛暟 -->
- <winConfig>
- <!-- 杞欢鍥炬爣 -->
+ <!--<winConfig>
<icoFile>
F:\workspace_java\JavaFx\SyncTools\src\main\deploy\package\windows\SyncTools.ico
</icoFile>
<generateSetup>false</generateSetup>
<generateMsi>false</generateMsi>
<generateMsm>false</generateMsm>
- </winConfig>
+ </winConfig>-->
<!--<linuxConfig></linuxConfig>-->
- <!--<macConfig></macConfig>-->
+ <macConfig>
+ <!-- 杞欢鍥炬爣 -->
+ <icnsFile>
+ /Users/hunter/workspace/JavaFx/SyncTools/src/main/deploy/package/mac/SyncTools.icns
+ </icnsFile>
+ </macConfig>
</configuration>
</execution>
</executions>
@@ -130,7 +136,8 @@
<configuration>
<verbose>true</verbose>
<fork>true</fork>
- <executable>D:\Develop\Java\jdk-9.0.1\bin\javac</executable>
+ <!--<executable>D:\Develop\Java\jdk-9.0.1\bin\javac</executable>-->
+ <executable>/Library/Java/JavaVirtualMachines/jdk1.8.0_101.jdk/Contents/Home/bin/javac</executable>
</configuration>
</plugin>
</plugins>
--
Gitblit v1.9.1