Fixed build scripts to correctly handle manifest.appcache

scripts/builder/backendBuilder.py

@@ -113,7 +113,7 @@ class BackendBuilder(object):
 					submoduleExtension = '.' + frontend.submodule
 
 				main.createFolder(os.path.join(self.frontEndTempFolder(), frontend.module))
-				frontend.copyResourcesToFolder(self.frontEndTempFolder())
+				frontend.copyResourcesToFolder(self.frontEndTempFolder(), self.settings)
 
 				if 'debug' in self.versions:
 					frontend.copyDebugResourcesToFolder(self.frontEndTempFolder())
@@ -121,7 +121,7 @@ class BackendBuilder(object):
 					self.writeToFolder(self.frontEndTempFolder(), os.path.join(frontend.module, 'index_debug' + submoduleExtension + '.html'), index)
 
 				if 'install' in self.versions:
-#					frontend.copyResourcesToFolder(self.frontEndTempFolder())
+#					frontend.copyResourcesToFolder(self.frontEndTempFolder(), self.settings)
 					index = self.configureIndexContent(frontend.assemble())
 					self.writeToFolder(self.frontEndTempFolder(), os.path.join(frontend.module, 'index' + submoduleExtension + '.html'), index)
 

scripts/builder/backends/checksumBuilder.py

@@ -42,7 +42,7 @@ class ChecksumBuilder(BackendBuilder):
 
 			index = self.configureIndexContent(frontend.assemble())
 			self.writeToFolder(self.frontEndTempFolder(), os.path.join(frontend.module, 'index' + submoduleExtension + '.html'), index)
-			frontend.copyResourcesToFolder(self.frontEndTempFolder())
+			frontend.copyResourcesToFolder(self.frontEndTempFolder(), self.settings)
 			self.logChecksums(index, "[" + self.name() + " - " + frontend.module + "] index" + submoduleExtension + ".html checksum")
 			print ""
 

scripts/builder/backends/devBuilder.py

@@ -39,7 +39,7 @@ class DevBuilder(BackendBuilder):
 				submoduleExtension = '.' + frontend.submodule
 
 			main.createFolder(os.path.join(self.frontEndTempFolder(), frontend.module))
-			frontend.copyResourcesToFolder(self.frontEndTempFolder())
+			frontend.copyResourcesToFolder(self.frontEndTempFolder(), self.settings)
 
 			index = self.configureIndexContent(frontend.assemble(assemblyMode='DEBUG', versionType='DEBUG'))
 			self.writeToFolder(self.frontEndTempFolder(), os.path.join(frontend.module, 'index' + submoduleExtension + '.html'), index)

scripts/builder/frontendBuilder.py

@@ -41,7 +41,7 @@ class FrontendBuilder(object):
 #	def copyStaticResources (self, targetFolder):
 #		raise NotImplementedError()
 
-	def copyResourcesToFolder (self, targetFolder):
+	def copyResourcesToFolder (self, targetFolder, backendSettings):
 		raise NotImplementedError()
 
 	def preprocessCSS (self, targetFile):
@@ -100,7 +100,7 @@ class FrontendBuilder(object):
 
 		
 
-#	def copyResourcesToFolder (self, targetFolder):
+#	def copyResourcesToFolder (self, targetFolder, backendSettings):
 #		for resoureceType in self.projectResourceTypes():
 #			self.copyResources(self.projectDir, targetFolder, resoureceType)
 #		self.copyStaticResources(targetFolder)

scripts/builder/frontends/betaBuilder.py

@@ -10,7 +10,7 @@ class BetaBuilder(FrontendBuilder):
 		return ['js', 'css', 'images']
 
 #	def copyStaticResources (self, targetFolder):
-	def copyResourcesToFolder (self, targetFolder):
+	def copyResourcesToFolder (self, targetFolder, backendSettings):
 		self.copyResources(self.projectDir, targetFolder, 'images')
 
 		for file in self.filterFiles(self.settings['staticResources']):

scripts/builder/frontends/deltaBuilder.py

@@ -17,7 +17,7 @@ class DeltaBuilder(FrontendBuilder):
 
 
 #	def copyStaticResources (self, targetFolder):
-	def copyResourcesToFolder (self, targetFolder):
+	def copyResourcesToFolder (self, targetFolder, backendSettings):
 		#print "DELTA - copyResourcesToFolder"
 		resourcesToCopy = [
 			{'folder': 'properties',	'source': 'manifest.appcache',	'target': 'manifest.appcache'}
@@ -27,6 +27,7 @@ class DeltaBuilder(FrontendBuilder):
 			#print "copying resource: " + str(resource['source'])
 			content = self.loadFilesContent(resource['folder'], [resource['source']])
 			content = content.replace('@application.version@',	self.repositoryVersion)
+			content = content.replace('@request.path@',			backendSettings['request.path'])
 
 			dst = self.absolutePathForTargetFile(targetFolder, '', resource['target'])
 			file = open(dst, 'w')

scripts/builder/frontends/gammaBuilder.py

@@ -10,7 +10,7 @@ class GammaBuilder(FrontendBuilder):
 		return ['js', 'css', 'images']
 
 #	def copyStaticResources (self, targetFolder):
-	def copyResourcesToFolder (self, targetFolder):
+	def copyResourcesToFolder (self, targetFolder, backendSettings):
 		self.copyResources(self.projectDir, targetFolder, 'images')
 
 		resourcesToCopy = [

scripts/builder/frontends/gamma_mobileBuilder.py

@@ -9,5 +9,5 @@ class Gamma_MobileBuilder(FrontendBuilder):
 		return ['js', 'css', 'images']
 
 #	def copyStaticResources (self, targetFolder):
-	def copyResourcesToFolder (self, targetFolder):
+	def copyResourcesToFolder (self, targetFolder, backendSettings):
 		pass