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

fix undo error

Browse Source 
improve ant builder to package zip files for deployment
This commit is contained in:
bancika
2016-05-09 16:05:29 +02:00
parent e2fb415a59
commit e7945df218
10 changed files with 47 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diy-layout-creator --username bancika@gmail.com/diylc-core/library/main.jar
BIN
View File
Binary file not shown.
diy-layout-creator --username bancika@gmail.com/diylc-library/lib/diylc-core.jar
BIN
View File
Binary file not shown.
diy-layout-creator --username bancika@gmail.com/diylc-swing/DIYLCStarter.launch
+1
View File
@@ -9,6 +9,7 @@
</listAttribute>
<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;sourceLookupDirector&gt;&#13;&#10;&lt;sourceContainers duplicates=&quot;false&quot;&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;Library&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;DIYLC&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;default/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.default&quot;/&gt;&#13;&#10;&lt;/sourceContainers&gt;&#13;&#10;&lt;/sourceLookupDirector&gt;&#13;&#10;"/>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_45"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.diylc.DIYLCStarter"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="diylc-swing"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms256m -Xmx512m -Dorg.diylc.scriptRun=true -Ddorg.diylc.debugComponentAreas=true"/>
diy-layout-creator --username bancika@gmail.com/diylc-swing/build.xml
+21 -2
View File
@@ -1,4 +1,4 @@
<project name="diylc-swing" basedir="." default="mac">
<project name="diylc-swing" basedir="." default="complete">
<property name="src.dir" value="src" />
@@ -7,6 +7,7 @@
<property name="jar.dir" value="${build.dir}/jar" />
<property name="report.dir" value="${build.dir}/junitreport" />
<property name="main.class" value="org.diylc.DIYLCStarter" />
<property name="diylc.version" value="3.31.0" />
<property name="classes.dir" value="${build.dir}/temp/${ant.project.name}/classes" />
<property name="test.classes.dir" value="${build.dir}/temp/${ant.project.name}/test.classes" />
@@ -75,7 +76,7 @@
<jarbundler bundleid="org.diylc"
dir="${jar.dir}"
name="DIYLC"
version="3.30.0"
version="${diylc.version}"
mainclass="${main.class}"
stubfile="JavaApplicationStub"
vmoptions="-Xms512m -Xmx2048m -Dorg.diylc.scriptRun=true"
@@ -99,6 +100,24 @@
</jarbundler>
</target>
<target name="complete" depends="mac">
<zip destfile="${build.dir}/diylc-${diylc.version}.zip">
<fileset dir="${jar.dir}" includes="diylc.jar"/>
<zipfileset dir="${jar.dir}/lib" prefix="lib"/>
<zipfileset dir="${jar.dir}/library/" prefix="library"/>
<zipfileset dir="templates" prefix="templates"/>
<zipfileset dir="themes" prefix="themes"/>
<zipfileset dir="." includes="update.xml"/>
<zipfileset dir="." includes="run.sh"/>
<zipfileset dir="." includes="diylc.l4j.ini"/>
<zipfileset dir="." includes="associations.bat"/>
<zipfileset dir="." includes="diylc.exe"/>
</zip>
<zip destfile="${build.dir}/diylc-${diylc.version}-osx.zip">
<zipfileset dir="${jar.dir}/DIYLC.app" prefix="DIYLC.app"/>
</zip>
</target>
<target name="javadoc">
<javadoc access="public" author="true" classpathref="class.path" destdir="doc" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" source="1.6" splitindex="true" use="true" version="true">
<fileset dir="${src.dir}">
diy-layout-creator --username bancika@gmail.com/diylc-swing/diylc.exe
BIN
View File
Binary file not shown.
diy-layout-creator --username bancika@gmail.com/diylc-swing/lib/diylc-core.jar
BIN
View File
Binary file not shown.
diy-layout-creator --username bancika@gmail.com/diylc-swing/library/main.jar
BIN
View File
Binary file not shown.
diy-layout-creator --username bancika@gmail.com/diylc-swing/run.sh
+1 -1
View File
@@ -1 +1 @@
java -Xms512m -Xmx2048m -Dorg.diylc.scriptRun=true -cp diylc.jar:lib org.diylc.DIYLCStarter
java -Xms512m -Xmx2048m -Dorg.diylc.scriptRun=true -Dfile.encoding=UTF-8 -cp diylc.jar:lib org.diylc.DIYLCStarter
diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/edit/EditMenuPlugin.java
+6 -5
View File
@@ -228,8 +228,8 @@ public class EditMenuPlugin implements IPlugIn, ClipboardOwner {
swingUI.injectMenuAction(getCopyAction(), EDIT_TITLE);
swingUI.injectMenuAction(getPasteAction(), EDIT_TITLE);
swingUI.injectMenuAction(null, EDIT_TITLE);
swingUI.injectMenuAction(actionFactory
.createSelectAllAction(plugInPort), EDIT_TITLE);
swingUI.injectMenuAction(
actionFactory.createSelectAllAction(plugInPort), EDIT_TITLE);
swingUI.injectMenuAction(getEditSelectionAction(), EDIT_TITLE);
swingUI.injectMenuAction(getDeleteSelectionAction(), EDIT_TITLE);
swingUI.injectMenuAction(getRotateClockwiseAction(), EDIT_TITLE);
@@ -252,8 +252,8 @@ public class EditMenuPlugin implements IPlugIn, ClipboardOwner {
swingUI.injectMenuAction(getExpandSelectionSameTypeAction(),
EXPAND_TITLE);
swingUI.injectMenuAction(null, EDIT_TITLE);
swingUI.injectMenuAction(actionFactory
.createEditProjectAction(plugInPort), EDIT_TITLE);
swingUI.injectMenuAction(
actionFactory.createEditProjectAction(plugInPort), EDIT_TITLE);
refreshActions();
}
@@ -275,7 +275,8 @@ public class EditMenuPlugin implements IPlugIn, ClipboardOwner {
(String) params[2]);
break;
case PROJECT_LOADED:
undoHandler.reset();
if ((Boolean) params[1])
undoHandler.reset();
break;
}
}
diy-layout-creator --username bancika@gmail.com/diylc-swing/update.xml
+16
View File
@@ -1313,5 +1313,21 @@
</changes>
<url>http://code.google.com/p/diy-layout-creator/downloads/list</url>
</org.diylc.appframework.update.Version>
<org.diylc.appframework.update.Version>
<versionNumber>
<major>3</major>
<minor>31</minor>
<build>0</build>
</versionNumber>
<releaseDate>2016-05-09 20:00:00.000 CET</releaseDate>
<name></name>
<changes>
<org.diylc.appframework.update.Change>
<changeType>BUG_FIX</changeType>
<description>Undo works only one level back (bug introduced in 3.29)</description>
</org.diylc.appframework.update.Change>
</changes>
<url>http://code.google.com/p/diy-layout-creator/downloads/list</url>
</org.diylc.appframework.update.Version>
</a>
</java.util.Arrays_-ArrayList>