Просмотр исходного кода

Make plugin libs get added to plugin jars correctly when built via netbeans (which doesn't build the jar and thus doesn't fire -pre-jar)

Automatically run `git submodule init` and `git submodule update` when compiling to make sure submodules are all ok.
tags/0.6.3m2a1
Shane Mc Cormack 15 лет назад
Родитель
Сommit
20515e1f9b
2 измененных файлов: 14 добавлений и 3 удалений
  1. 13
    2
      build.xml
  2. 1
    1
      createAllPluginJar.sh

+ 13
- 2
build.xml Просмотреть файл

@@ -12,9 +12,20 @@
12 12
     <import file="build-tests.xml"/>
13 13
     <import file="build-versioning.xml"/>
14 14
 
15
-    <target name="-post-compile" depends="-write-version, build-plugins"/>
15
+    <target name="-submodules">
16
+        <exec executable="git">
17
+            <arg value="submodule"/>
18
+            <arg value="init"/>
19
+        </exec>
20
+        <exec executable="git">
21
+            <arg value="submodule"/>
22
+            <arg value="update"/>
23
+        </exec>
24
+    </target>
25
+
26
+    <target name="-pre-init" depends="-submodules"/>
27
+    <target name="-post-compile" depends="-write-version, build-plugins, -addpluginlibs"/>
16 28
     <target name="-post-test-run" depends="-do-test-reports"/>
17
-    <target name="-pre-jar" depends="-addpluginlibs"/>
18 29
     <target name="-post-jar" depends="-addjarlibs"/>
19 30
 
20 31
 </project>

+ 1
- 1
createAllPluginJar.sh Просмотреть файл

@@ -18,7 +18,7 @@ fi
18 18
 plugins="ui_swing.jar tabcompletion_bash.jar tabcompletion_mirc.jar"
19 19
 mkdir -p ${PWD}/build/classes/plugins
20 20
 for PLUGIN in ${plugins}; do
21
-	ln -s ${PWD}/plugins/${PLUGIN} ${PWD}/build/classes/plugins/${PLUGIN};
21
+	ln -sf ${PWD}/plugins/${PLUGIN} ${PWD}/build/classes/plugins/${PLUGIN};
22 22
 done;
23 23
 
24 24
 #if [ -d ${PWD}/build/classes -a ! -e ${PWD}/build/classes/plugins ]; then

Загрузка…
Отмена
Сохранить