[Jrisk-cvs] SF.net SVN: jrisk:[333] Domination
Brought to you by:
yuranet
Menu
▾
▴
[Jrisk-cvs] SF.net SVN: jrisk:[333] Domination
|
From: <yu...@us...> - 2010-01-13 18:18:51
|
Revision: 333
http://jrisk.svn.sourceforge.net/jrisk/?rev=333&view=rev
Author: yuranet
Date: 2010-01-13 18:18:43 +0000 (Wed, 13 Jan 2010)
Log Message:
-----------
build working better still
Modified Paths:
--------------
Domination/build.xml
Domination/installer/izpack/install.xml
Domination/installer/jsmooth/installer.jsmooth
Domination/lib/TranslationTool.jar
Domination/src/META-INF/MANIFEST.MF
Domination/src/net/yura/domination/ui/SwingGUI/SwingGUIPanel.java
Modified: Domination/build.xml
===================================================================
--- Domination/build.xml 2010-01-13 16:34:15 UTC (rev 332)
+++ Domination/build.xml 2010-01-13 18:18:43 UTC (rev 333)
@@ -15,19 +15,19 @@
<property name="game.version" value="1.1.0.0"/>
-
+ <!-- -->
<property name="game.name" value="Domination"/>
<property name="game.website" value="http://domination.sf.net/"/>
<property name="game.defaultmap" value="luca.map"/>
<property name="game.defaultcards" value="risk.cards"/>
+ <!-- -->
-
- <!--
+ <!-- - ->
<property name="game.name" value="Risk"/>
<property name="game.website" value="http://risk.sf.net/"/>
<property name="game.defaultmap" value="board.map"/>
<property name="game.defaultcards" value="risk.cards"/>
- -->
+ <!- - -->
<filter token="game.version" value="${game.version}"/>
<filter token="game.name" value="${game.name}"/>
@@ -36,12 +36,7 @@
<filter token="game.defaultcards" value="${game.defaultcards}"/>
<property name="dir.build" location="build"/>
-
<property name="dir.build.classes" location="${dir.build}/classes"/>
-
- <property name="dir.build.lobby.client.classes" location="${dir.build}/lobby/clientclasses"/>
- <property name="dir.build.lobby.server.classes" location="${dir.build}/lobby/serverclasses"/>
-
<property name="dir.build.manual" location="${dir.build}/manual"/>
<!-- all required dirs and files will be copied to there before packing the zip -->
<property name="dir.build.game" location="${dir.build}/game"/>
@@ -51,28 +46,29 @@
<property name="file.src" location="${dir.dist}/src.zip"/>
- <!-- if the izpack installer jar is available -->
+
+ <!-- if the izpack installer jar is available -->
<property name="izpack.compiler" value="${basedir}/installer/izpack/standalone-compiler.jar"/>
<property name="jsmooth.compiler" value="${basedir}/installer/jsmooth/jsmoothgen-ant.jar"/>
- <property name="dir.lobby.dist.server" location="../Lobby/dist/server"/>
- <property name="dir.lobby.dist.client" location="../Lobby/dist/client"/>
+ <available file="${izpack.compiler}" property="izpack.available"/>
+ <available file="${jsmooth.compiler}" property="jsmooth.available"/>
- <property file="build.properties" />
-
- <available file="${izpack.compiler}" property="izpack.available"/>
- <available file="${jsmooth.compiler}" property="jsmooth.available"/>
-
<condition property="lobby.available">
<and>
- <available file="LobbyServer.jar" property="lobby.server.available"/>
- <available file="LobbyClient.jar" property="lobby.client.available"/>
+ <available file="lib/LobbyServer.jar" property="lobby.server.available"/>
+ <available file="lib/LobbyClient.jar" property="lobby.client.available"/>
</and>
</condition>
+ <property name="dir.build.lobby.client.classes" location="${dir.build}/lobby/clientclasses"/>
+ <property name="dir.build.lobby.server.classes" location="${dir.build}/lobby/serverclasses"/>
+ <property name="dir.lobby.dist.server" location="../Lobby/dist/server"/>
+ <property name="dir.lobby.dist.client" location="../Lobby/dist/client"/>
+
<available file="${dir.lobby.dist.server}" property="dir.lobby.dist.server.available"/>
<available file="${dir.lobby.dist.client}" property="dir.lobby.dist.client.available"/>
@@ -81,6 +77,11 @@
+ <property file="build.properties" />
+
+
+
+
<target name="classes" description="compiles all the classes">
<mkdir dir="${dir.build.classes}"/>
@@ -145,6 +146,7 @@
<mkdir dir="${dir.build.game}/saves"/>
<copy file="${dir.dist}/${game.name}.jar" todir="${dir.build.game}"/>
+ <copy file="lib/TranslationTool.jar" todir="${dir.build.game}"/>
<copy todir="${dir.build.game}" filtering="true">
<!-- script start files for easy starting -->
Modified: Domination/installer/izpack/install.xml
===================================================================
--- Domination/installer/izpack/install.xml 2010-01-13 16:34:15 UTC (rev 332)
+++ Domination/installer/izpack/install.xml 2010-01-13 18:18:43 UTC (rev 333)
@@ -39,6 +39,7 @@
<langpack iso3="por"/>
<langpack iso3="swe"/>
<langpack iso3="glg"/>
+ <langpack iso3="pol"/>
</locale>
<!--
@@ -46,8 +47,8 @@
The ids must be these ones if you want to use the LicencePanel and/or the InfoPanel.
-->
<resources>
- <res id="LicencePanel.licence" src="../../gpl.txt"/>
- <res id="InfoPanel.info" src="../../ReadMe.txt"/>
+ <res id="LicencePanel.licence" src="../../build/game/gpl.txt"/>
+ <res id="InfoPanel.info" src="../../build/game/ReadMe.txt"/>
<!-- packs translation files -->
<res id="packsLang.xml_deu" src="../../installer/izpack/packsLang.xml_deu"/>
Modified: Domination/installer/jsmooth/installer.jsmooth
===================================================================
--- Domination/installer/jsmooth/installer.jsmooth 2010-01-13 16:34:15 UTC (rev 332)
+++ Domination/installer/jsmooth/installer.jsmooth 2010-01-13 18:18:43 UTC (rev 333)
@@ -9,7 +9,7 @@
<arguments></arguments>
<embeddedJar>true</embeddedJar>
<executableName>@game.name@_in...@ga...rsion@.exe</executableName>
- <iconLocation>../resources/icon.png</iconLocation>
+ <iconLocation>../res/icons/icon.png</iconLocation>
<initialMemoryHeap>-1</initialMemoryHeap>
<jarLocation>../dist/@game.name@_in...@ga...rsion@.jar</jarLocation>
<mainClassName>com.izforge.izpack.installer.Installer</mainClassName>
Modified: Domination/lib/TranslationTool.jar
===================================================================
(Binary files differ)
Modified: Domination/src/META-INF/MANIFEST.MF
===================================================================
--- Domination/src/META-INF/MANIFEST.MF 2010-01-13 16:34:15 UTC (rev 332)
+++ Domination/src/META-INF/MANIFEST.MF 2010-01-13 18:18:43 UTC (rev 333)
@@ -1,3 +1,4 @@
Manifest-Version: 1.0
Created-By: Yura Mamyrin (yu...@yu...)
Main-Class: net.yura.domination.ui.FlashGUI.MainMenu
+Class-Path: TranslationTool.jar
Modified: Domination/src/net/yura/domination/ui/SwingGUI/SwingGUIPanel.java
===================================================================
--- Domination/src/net/yura/domination/ui/SwingGUI/SwingGUIPanel.java 2010-01-13 16:34:15 UTC (rev 332)
+++ Domination/src/net/yura/domination/ui/SwingGUI/SwingGUIPanel.java 2010-01-13 18:18:43 UTC (rev 333)
@@ -307,6 +307,8 @@
// now gui is setup u can listen
myrisk.addRiskListener( new SwingRiskAdapter() );
+
+ debugTab.start();
}
public void setupLobbyButton() {
@@ -1548,6 +1550,39 @@
debugPanel.add( new JLabel(" Debug Log"), BorderLayout.NORTH );
debugPanel.add(debugScroll);
+ // ####### err
+
+ errText = new JTextArea();
+ errText.setEditable(false);
+
+
+ JScrollPane errScroll = new JScrollPane( errText );
+ //errScroll.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS);
+ //errScroll.setBorder( BorderFactory.createTitledBorder( BorderFactory.createLoweredBevelBorder() , "Error Log", javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.ABOVE_TOP ) );
+
+ JPanel errPanel = new JPanel( new BorderLayout() );
+ errPanel.add( new JLabel(" Error Log"), BorderLayout.NORTH );
+ errPanel.add(errScroll);
+
+ // ######## split
+
+ debugPanel.setOpaque(false);
+ errPanel.setOpaque(false);
+
+ setLeftComponent(debugPanel);
+ setRightComponent(errPanel);
+
+ setContinuousLayout(true);
+ setOneTouchExpandable(true);
+ setDividerLocation(400);
+ setBorder( BorderFactory.createEmptyBorder() );
+
+ setOpaque(false);
+
+ }
+
+ public void start() {
+
int size = 16;
Image img = new BufferedImage(size,size,BufferedImage.TYPE_INT_ARGB);
Graphics g = img.getGraphics();
@@ -1556,11 +1591,6 @@
g.dispose();
final Icon icon = new ImageIcon(img);
- // ####### err
-
- errText = new JTextArea();
- errText.setEditable(false);
-
PrintStream ps = SimplePrintStream.getSimplePrintStream(
new StringWriter() {
@@ -1591,31 +1621,8 @@
}
- JScrollPane errScroll = new JScrollPane( errText );
- //errScroll.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS);
- //errScroll.setBorder( BorderFactory.createTitledBorder( BorderFactory.createLoweredBevelBorder() , "Error Log", javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.ABOVE_TOP ) );
+ }
- JPanel errPanel = new JPanel( new BorderLayout() );
- errPanel.add( new JLabel(" Error Log"), BorderLayout.NORTH );
- errPanel.add(errScroll);
-
- // ######## split
-
- debugPanel.setOpaque(false);
- errPanel.setOpaque(false);
-
- setLeftComponent(debugPanel);
- setRightComponent(errPanel);
-
- setContinuousLayout(true);
- setOneTouchExpandable(true);
- setDividerLocation(400);
- setBorder( BorderFactory.createEmptyBorder() );
-
- setOpaque(false);
-
- }
-
public void actionPerformed(ActionEvent a) {
if (a.getActionCommand().equals("play debug")) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|