X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=scripts%2Fmake_release.py;h=cf3f48923539b109cd5c6d3ff41176aaac2c6a68;hb=726720187da7ed257e768511fe4b2ad4660fcefb;hp=d996b40bd54a25f37927097a60b8671c4d3323cd;hpb=4968dd4825820fcedb0af31ae85f98c1d91bac9b;p=platform%2Fupstream%2FVK-GL-CTS.git

diff --git a/scripts/make_release.py b/scripts/make_release.py
index d996b40..cf3f489 100644
--- a/scripts/make_release.py
+++ b/scripts/make_release.py
@@ -1,5 +1,25 @@
 # -*- coding: utf-8 -*-
 
+#-------------------------------------------------------------------------
+# drawElements Quality Program utilities
+# --------------------------------------
+#
+# Copyright 2015 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#-------------------------------------------------------------------------
+
 import os
 import re
 import sys
@@ -96,21 +116,22 @@ class CopyFile (DstFile):
 			die("%s already exists" % self.dstFile)
 		shutil.copyfile(self.srcFile, self.dstFile)
 
-class GenInfoFile (DstFile):
-	def __init__ (self, srcFile, dstFile):
-		super(GenInfoFile, self).__init__(dstFile)
-		self.srcFile = srcFile
+class GenReleaseInfoFileTarget (DstFile):
+	def __init__ (self, dstFile):
+		super(GenReleaseInfoFileTarget, self).__init__(dstFile)
 
 	def make (self, packageBuildInfo):
 		self.makeDir()
-		print "    GenInfoFile: %s" % removeLeadingPath(self.dstFile, packageBuildInfo.dstBasePath)
-		src			= readFile(self.srcFile)
 
-		for define, value in [("DEQP_RELEASE_NAME", 	"\"%s\""	% packageBuildInfo.getReleaseVersion()),
-							  ("DEQP_RELEASE_ID",		"0x%08x"	% packageBuildInfo.getReleaseId())]:
-			src = re.sub('(#\s*define\s+%s\s+)[^\n\r]+' % re.escape(define), r'\1 %s' % value, src)
-
-		writeFile(self.dstFile, src)
+		scriptPath = os.path.normpath(os.path.join(packageBuildInfo.srcBasePath, "framework", "qphelper", "gen_release_info.py"))
+		execute([
+				"python",
+				"-B", # no .py[co]
+				scriptPath,
+				"--name=%s" % packageBuildInfo.getReleaseVersion(),
+				"--id=0x%08x" % packageBuildInfo.getReleaseId(),
+				"--out=%s" % self.dstFile
+			])
 
 class GenCMake (DstFile):
 	def __init__ (self, srcFile, dstFile, replaceVars):
@@ -362,15 +383,13 @@ BASE = Module("Base", [
 	makeFileCopyGroup	("doc/testlog-stylesheet",					"doc/testlog-stylesheet",				["*"]),
 
 	# Non-optional parts of framework
-	# \note qpInfo.c must be processed!
-	FileTargetGroup		("framework", "src/framework", [
-			# If file is qpInfo.c use GenInfoFile
-			(lambda f: f[-8:] == "qpInfo.c", lambda s, d: GenInfoFile(s, d)),
-			# Otherwise just CopyFile targets
-			copyFileFilter(SRC_FILE_PATTERNS, ["imagedifftester", "randomshaders", "simplereference", "referencerenderer"])
-		]),
-
-	# Main modules CMakeLists.txt
+	makeFileCopy		("framework/CMakeLists.txt", 				"src/framework/CMakeLists.txt"),
+	makeFileCopyGroup	("framework/delibs",						"src/framework/delibs",					SRC_FILE_PATTERNS),
+	makeFileCopyGroup	("framework/common",						"src/framework/common",					SRC_FILE_PATTERNS),
+	makeFileCopyGroup	("framework/qphelper",						"src/framework/qphelper",				SRC_FILE_PATTERNS),
+	makeFileCopyGroup	("framework/platform",						"src/framework/platform",				SRC_FILE_PATTERNS),
+	makeFileCopyGroup	("framework/opengl",						"src/framework/opengl",					SRC_FILE_PATTERNS, ["simplereference"]),
+	makeFileCopyGroup	("framework/egl",							"src/framework/egl",					SRC_FILE_PATTERNS),
 
 	# android sources
 	makeFileCopyGroup	("android/package/src",						"src/android/package/src",				SRC_FILE_PATTERNS),
@@ -384,6 +403,9 @@ BASE = Module("Base", [
 		"launch.py",
 		"debug.py"
 		]),
+
+	# Release info
+	GenReleaseInfoFileTarget("src/framework/qphelper/qpReleaseInfo.inl")
 ])
 
 DOCUMENTATION = Module("Documentation", [