summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelliott_c <ocielliottc@users.noreply.github.com>2004-08-30 13:09:29 +0000
committerelliott_c <ocielliottc@users.noreply.github.com>2004-08-30 13:09:29 +0000
commit1dbf634fe2eab40b0590ca43b60a81697d53950a (patch)
tree20f1cebc77682e7208c72e2daee29f5e7e4b708f
parentca49d43d35092257e104f5b81cde011f2aff7ddf (diff)
downloadMPC-1dbf634fe2eab40b0590ca43b60a81697d53950a.tar.gz
ChangeLogTag: Mon Aug 30 08:07:51 2004 Chad Elliott <elliott_c@ociweb.com>
-rw-r--r--ChangeLog15
-rw-r--r--README2
-rw-r--r--config/qt_uic.mpb13
-rw-r--r--modules/ProjectCreator.pm10
4 files changed, 39 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a2418beb..fcc78d29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Mon Aug 30 08:07:51 2004 Chad Elliott <elliott_c@ociweb.com>
+
+ * README:
+ * modules/ProjectCreator.pm:
+
+ Added the ability to get the input and output file names without
+ an extension.
+
+ * config/qt_uic.mpb:
+
+ Added support for generating uic interface declarations and
+ implementations.
+
Mon Aug 30 06:45:25 2004 Chad Elliott <elliott_c@ociweb.com>
* modules/ProjectCreator.pm:
@@ -27,7 +40,7 @@ Thu Aug 26 17:38:41 2004 J.T. Conklin <jtc@acorntoolworks.com>
* modules/AutomakeWorkspaceCreator.pm:
- Fix tipos, forgot a leading $.
+ Fix typos, forgot a leading $.
Thu Aug 26 09:14:57 2004 Chad Elliott <elliott_c@ociweb.com>
diff --git a/README b/README
index 3bf654c3..de3e3488 100644
--- a/README
+++ b/README
@@ -260,6 +260,8 @@ postcommand Allows a user to execute arbitrary commands after
within the postcommand assignment:
<%input%> - The input file for the original command.
<%output%> - The output created by the original command.
+ <%input_noext%> - The input file with no extension.
+ <%output_noext%> - The output file with no extension.
The output file can be referenced as a generic output
file using <%output%> or can be referenced as a
component file (if it matches the particular type)
diff --git a/config/qt_uic.mpb b/config/qt_uic.mpb
new file mode 100644
index 00000000..64207631
--- /dev/null
+++ b/config/qt_uic.mpb
@@ -0,0 +1,13 @@
+// -*- MPC -*-
+// $Id$
+
+project : qt {
+ Define_Custom(UIC) {
+ automatic = 1
+ command = $(QTDIR)/bin/uic
+ postcommand = $(QTDIR)/bin/uic -impl <%input_noext%>.h -o <%input_noext%>.cpp <%input%>
+ output_option = -o
+ inputext = .ui
+ header_outputext = .h
+ }
+}
diff --git a/modules/ProjectCreator.pm b/modules/ProjectCreator.pm
index ed20cff3..01b83d11 100644
--- a/modules/ProjectCreator.pm
+++ b/modules/ProjectCreator.pm
@@ -2645,6 +2645,16 @@ sub convert_command_parameters {
$valid{'output'} = $output;
$valid{'temporary'} = 'temp.$$$$.' . int(rand(0xffffffff));
+ if (defined $input) {
+ $valid{'input_noext'} = $input;
+ $valid{'input_noext'} =~ s/\.[^\.]+$//;
+ }
+
+ if (defined $output) {
+ $valid{'output_noext'} = $output;
+ $valid{'output_noext'} =~ s/\.[^\.]+$//;
+ }
+
## Add in the specific types of output files
if (defined $output) {
foreach my $type (keys %{$self->{'valid_components'}}) {