Permalink
Browse files

redefined build configuration

added version label at welcome tab page
  • Loading branch information...
1 parent 0083f90 commit b295f1b2235dbfe26aa5e065fb8e31ead31df9cc tomek committed Sep 24, 2012
View
@@ -191,7 +191,7 @@
<scanIntervalSeconds>0</scanIntervalSeconds>
<contextPath>/</contextPath>
- <webAppSourceDirectory>${project.build.directory}/${project.build.finalName}</webAppSourceDirectory>
+ <webAppSourceDirectory>${webappDirectory}</webAppSourceDirectory>
<connectors>
<connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
<port>8080</port>
@@ -247,7 +247,7 @@
<configuration>
<executable>python</executable>
<workingDirectory>src/main/frontend</workingDirectory>
- <commandlineArgs>generate.py build</commandlineArgs>
+ <commandlineArgs>generate.py</commandlineArgs>
</configuration>
</execution>
</executions>
@@ -259,6 +259,7 @@
<configuration>
<port>8080</port>
<useTestClasspath>false</useTestClasspath>
+ <warSourceDirectory>${webappDirectory}</warSourceDirectory>
</configuration>
</plugin>
<plugin>
@@ -17,7 +17,7 @@
}
],
- "version" : "1.1",
+ "version" : "not valid",
"qooxdoo-versions": ["2.0.1"]
},
@@ -29,10 +29,11 @@
"simulation-run",
"test",
"test-source",
- "translation"
+ "translation",
+ "build-withver"
],
- "default-job" : "source-hybrid",
+ "default-job" : "build-withver",
"let" :
{
@@ -44,7 +45,8 @@
"LOCALES" : [ "en" ],
"CACHE" : "${TMPDIR}/qx${QOOXDOO_VERSION}/cache",
"ROOT" : ".",
- "BUILD_PATH" : "../webapp/helenos"
+ "BUILD_PATH" : "../../../target/helenos-${HELENOS_VER}/helenos/",
+ "HELENOS_VER" : "1.1"
},
"jobs" :
@@ -57,6 +59,12 @@
"manifest" : "contribs/dialog/Manifest.json"
}
]
+ },
+ "build-withver" : {
+ "extend" : ["build"],
+ "environment" : {
+ "qx.app.version" : "${HELENOS_VER}"
+ }
}
}
}
@@ -39,7 +39,6 @@ qx.Class.define("helenos.Application",
}
qx.locale.Manager.getInstance().setLocale("en");
-
this.getRoot().add(new helenos.components.TopComposite(), {
edge : 0
});
@@ -31,5 +31,12 @@ qx.Class.define("helenos.components.tab.WelcomePage",
var iframe = new qx.ui.embed.ThemedIframe('resource/welcome.html');
this.add(iframe, {flex : 1});
+ this.add(this.__getVersionInfoBox());
+ },
+
+ members : {
+ __getVersionInfoBox : function() {
+ return new qx.ui.basic.Label('Version ' + qx.core.Environment.get('qx.app.version'));
+ }
}
});

0 comments on commit b295f1b

Please sign in to comment.