[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenonbeta/unsermake
From:       Nicolas Goutte <nicolasg () snafu ! de>
Date:       2006-03-11 17:34:00
Message-ID: 1142098440.028999.28570.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 517632 by goutte:

A uic4 UI file might have a .ui4 extension, so do not do the uic call 
with a fixed .ui extension


 M  +4 -4      designer.um  


--- trunk/kdenonbeta/unsermake/designer.um #517631:517632
@@ -79,8 +79,8 @@
 					rules.append( "%s -tr ${UIC_TR} -i %s.h $$adir/%s%s > %s.temp ; ret=$$?; \\"
 								  % (uic_version, base, base, ext, outputfile) )
 				else:
-					rules.append( "%s -tr ${UIC_TR} $$adir/%s.ui > %s.temp ; ret=$$?; \\"
-								  % (uic_version, base, outputfile) )
+					rules.append( "%s -tr ${UIC_TR} $$adir/%s%s > %s.temp ; ret=$$?; \\"
+								  % (uic_version, base, ext, outputfile) )
 
 				line = 'sed -e "s,${UIC_TR}( \"\" ),QString::null,g" %s.temp ' % (outputfile)
 				line = line + '| sed -e "s,image\([0-9][0-9]*\)_data,img\\1_%s,g" ' % \
canon_source @@ -96,8 +96,8 @@
 					rules.append( "@%s -i %s.h %s%s > %s ; ret=$$?; \\"
 								  % (uic_version, base, sourcedir + base, ext, outputfile) )
 				else:
-					rules.append( "@%s %s.ui > %s ; ret=$$?; \\"
-								  % (uic_version, base, outputfile) )
+					rules.append( "@%s %s%s > %s ; ret=$$?; \\"
+								  % (uic_version, base, ext, outputfile) )
 
 			if uifile_version == 3:
 				rules.append( "if test \"$$ret\" = 0; then echo '#include \"%s.moc\"' >> %s; \
else rm -f %s; exit $$ret; fi"


[prev in list] [next in list] [prev in thread] [next in thread]