Commit 1bdde16f authored by Florian Schäfer's avatar Florian Schäfer

Put all source and resource files in subdirectories of `src/`

* src/ → src/main/java/
* images → src/main/resources/images/
* poSrc/ → src/main/po/
* the NetBeans project files are deleted

For now I leave the tests where they are, before moving them, let's see how this works with the Ant build.
parent 963dce46
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="src" path="test/unit"/>
<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
......
......@@ -2,7 +2,7 @@
host = https://www.transifex.com
[josm.josm-plugin_wikipedia]
file_filter = poSrc/<lang>.po
file_filter = src/main/po/<lang>.po
source_file = build/i18n/josm-plugin_wikipedia.pot
source_lang = en
type = PO
......
......@@ -49,20 +49,6 @@ test {
}
sourceSets {
main {
java {
srcDirs = ["src"]
}
po {
srcDirs = ["poSrc"]
}
resources {
srcDirs = ["$projectDir"]
include "images/**"
include "LICENSE"
include "README.md"
}
}
test {
java {
srcDirs = ["test/unit"]
......@@ -72,6 +58,10 @@ sourceSets {
}
}
}
tasks.processResources {
from("$projectDir/LICENSE")
from("$projectDir/README.md")
}
archivesBaseName = "wikipedia"
version = getVersion()
......
<?xml version="1.0" encoding="utf-8"?>
<project name="wikipedia" default="dist2" basedir=".">
<project name="wikipedia" default="dist" basedir=".">
<!-- enter the SVN commit message -->
<property name="commit.message" value="Commit message"/>
<property name="plugin.src.dir" value="src/main/java"/>
<property name="plugin.build.dir" value="src/main/resources"/>
<!-- edit the properties of this plugin in the file `gradle.properties` -->
<property file="${basedir}/gradle.properties"/>
......@@ -10,8 +12,4 @@
<!-- ** include targets that all plugins have in common ** -->
<import file="../build-common.xml"/>
<target name="dist2" depends="dist">
<copy file="${plugin.jar}" todir="${plugin.dist.dir}/../.josm/plugins"/>
</target>
</project>
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.ant.freeform</type>
<configuration>
<general-data xmlns="http://www.netbeans.org/ns/freeform-project/1">
<name>wikipedia</name>
</general-data>
<general-data xmlns="http://www.netbeans.org/ns/freeform-project/2">
<!-- Не используйте диалоговое окно свойств проекта при редактировании данного файла вручную. -->
<name>wikipedia</name>
<properties/>
<folders>
<source-folder>
<label>src</label>
<type>java</type>
<location>src</location>
<encoding>UTF-8</encoding>
</source-folder>
<source-folder>
<label>test</label>
<type>java</type>
<location>test</location>
<encoding>UTF-8</encoding>
</source-folder>
<source-folder>
<label>wikipedia</label>
<location>.</location>
<encoding>UTF-8</encoding>
</source-folder>
</folders>
<ide-actions>
<action name="build">
<target>compile</target>
</action>
<action name="clean">
<target>clean</target>
</action>
<action name="run">
<target>runjosm</target>
</action>
<action name="rebuild">
<target>clean</target>
<target>compile</target>
</action>
</ide-actions>
<view>
<items>
<source-folder style="packages">
<label>src</label>
<location>src</location>
</source-folder>
<source-folder style="packages">
<label>test</label>
<location>test</location>
</source-folder>
<source-file>
<location>build.xml</location>
</source-file>
</items>
<context-menu>
<ide-action name="build"/>
<ide-action name="rebuild"/>
<ide-action name="clean"/>
<ide-action name="run"/>
</context-menu>
</view>
</general-data>
<java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/3">
<compilation-unit>
<package-root>src</package-root>
<classpath mode="compile">../../core/src</classpath>
<source-level>1.8</source-level>
</compilation-unit>
<compilation-unit>
<package-root>test</package-root>
<unit-tests/>
<source-level>1.8</source-level>
</compilation-unit>
</java-data>
</configuration>
</project>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment