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

List:       kde-commits
Subject:    kdenonbeta/unsermake
From:       David Faure <faure () kde ! org>
Date:       2006-01-02 16:10:10
Message-ID: 1136218210.469034.8897.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 493514 by dfaure:

Make files named .uic3 work - had to separate the real extension from the \
uifile_version, doing ext=".ui3" is a nasty hack...
I hope Coolo is proud, I hacked unsermake instead of bugging him :)


 M  +28 -17    designer.um  


--- trunk/kdenonbeta/unsermake/designer.um #493513:493514
@@ -18,7 +18,7 @@
 		rulef = program.mfile
 
 		sourcedir = ''
-		if program.mfile.in_srcdir(base + ".ui"):
+		if program.mfile.in_srcdir(base + ext):
 			sourcedir = rulef.source
 		else:
 			sourcedir = rulef.build
@@ -27,20 +27,31 @@
 		if rulef.is_defined("UNSERMAKE_UIFILES"):
 			ui_files = rulef.definition("UNSERMAKE_UIFILES")
 
+		uifile_version = 0
+
 		if ext == '.ui':
 			if base in rulef.definition("QT3_UIFILES"):
-				ext = '.ui3'
+				uifile_version = 3
 			elif base in rulef.definition("QT4_UIFILES"):
-				ext = '.ui4'
+				uifile_version = 4
 			else:
 				# If UIC3_PATH is undefined we're using KDE 3, and we can assume a qt3-format \
.ui file.  if not utilities.subst_vars.has_key("UIC3_PATH"):
-					ext = '.ui3'
+					uifile_version = 3
 				else:
 					utilities.print_error( "%s: Unknown UIC version for %s. Rerun make -f \
Makefile.cvs.\n"  % (rulef.filename, rulef.dirname + "/" + base + ext) )
+		else:
+			if ext == '.ui3':
+				uifile_version = 3
+			else:
+				if ext == '.ui4':
+					uifile_version = 4
+				else: # can't happen
+					utilities.print_error("%s: Unknown extension, can't happen\n" % \
(rulef.filename)) +					return
 
-		if ext == '.ui3':
+		if uifile_version == 3:
 			# If UIC3_PATH is undefined we're using KDE 3
 			if utilities.subst_vars.has_key("UIC3_PATH"):
 				uic_version = "$(UIC3_PATH)"
@@ -64,9 +75,9 @@
 				canon_source = utilities.canon_name(base)
 				rules.append("@adir=`cd %s && pwd` ;\\" % sourcedir)
 
-				if ext == '.ui3':
-					rules.append( "%s -tr ${UIC_TR} -i %s.h $$adir/%s.ui > %s.temp ; ret=$$?; \\"
-								  % (uic_version, base, base, outputfile) )
+				if uifile_version == 3:
+					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) )
@@ -76,27 +87,27 @@
 				line = line + '>> %s ;\\' % (outputfile)
 				rules.append( line )
 
-				if ext == '.ui3':
+				if uifile_version == 3:
 					rules.append('rm -f %s.temp ;\\' % (outputfile))
 				else:
 					rules.append('rm -f %s.temp' % (outputfile))
 			else:
-				if ext == '.ui3':
-					rules.append( "@%s -i %s.h %s.ui > %s ; ret=$$?; \\"
-								  % (uic_version, base, sourcedir + base, outputfile) )
+				if uifile_version == 3:
+					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) )
 
-			if ext == '.ui3':
+			if uifile_version == 3:
 				rules.append( "if test \"$$ret\" = 0; then echo '#include \"%s.moc\"' >> %s; \
else rm -f %s; exit $$ret; fi"  % (base, outputfile, outputfile) )
 
 				rulef.insertTarget(outputfile,
-								   [sourcedir + base + ".ui", rulef.build + base + ".h"],
+								   [sourcedir + base + ext, rulef.build + base + ".h"],
 								   rules)
 
-				rulef.insertTarget(rulef.build + base + ".h", [sourcedir + base + ".ui"],
+				rulef.insertTarget(rulef.build + base + ".h", [sourcedir + base + ext],
 								   ["@echo '%s %s.h%s'" % (utilities.creating_text, rulef.build + base, \
utilities.normal),  "@%s -o $@ $?" % (uic_version)])
 			
@@ -107,12 +118,12 @@
 								   rules)
 			
 			rulef.add_define("UNSERMAKE_UIFILES", base)
-			if ext == '.ui3':
+			if uifile_version == 3:
 				program.cleanfiles.extend([base + ".h", base + ".cpp"])
 			else:
 				program.cleanfiles.append(base + ".h")
 			
-		if ext == '.ui3':
+		if uifile_version == 3:
 			program.handle_source(base, ".cpp")
 
 	def create_source(self, program, base, ext):


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