Merge branch 'master' into dev

This commit is contained in:
kovacsv 2024-05-05 07:54:55 +02:00
commit 056b3f8dfc
3 changed files with 12 additions and 8 deletions

View File

@ -67,10 +67,14 @@ def CreateWebsite (rootDir, websiteDir, version, testBuild):
if os.path.exists (metaFile):
metaContent = Utils.GetFileContent (metaFile)
replacer.ReplaceTokenContent ('<!-- meta start -->', '<!-- meta end -->', metaContent)
analyticsFile = os.path.join (rootDir, 'plugins', 'website_analytics_data.txt')
if os.path.exists (analyticsFile) and not testBuild:
analyticsContent = Utils.GetFileContent (analyticsFile)
replacer.ReplaceTokenContent ('<!-- analytics start -->', '<!-- analytics end -->', analyticsContent)
websiteAnalyticsFile = os.path.join (rootDir, 'plugins', 'website_analytics_data.txt')
if os.path.exists (websiteAnalyticsFile) and not testBuild:
websiteAnalyticsContent = Utils.GetFileContent (websiteAnalyticsFile)
replacer.ReplaceTokenContent ('<!-- website analytics start -->', '<!-- website analytics end -->', websiteAnalyticsContent)
embedAnalyticsFile = os.path.join (rootDir, 'plugins', 'embed_analytics_data.txt')
if os.path.exists (websiteAnalyticsFile) and not testBuild:
embedAnalyticsContent = Utils.GetFileContent (embedAnalyticsFile)
replacer.ReplaceTokenContent ('<!-- embed analytics start -->', '<!-- embed analytics end -->', embedAnalyticsContent)
replacer.WriteToFile (htmlFilePath)
def CreateEnginePackage (rootDir, engineDir, websiteDir):

View File

@ -16,7 +16,7 @@
<script type="text/javascript" src="../build/website_dev/o3dv.website.min.js"></script>
<!-- website end -->
<!-- analytics start -->
<!-- embed analytics start -->
<script type="text/javascript">
OV.SetWebsiteEventHandler ((eventName, eventLabel, eventParams) => {
console.log ({
@ -26,7 +26,7 @@
});
});
</script>
<!-- analytics end -->
<!-- embed analytics end -->
<!-- embed init start -->
<script type="text/javascript">

View File

@ -19,7 +19,7 @@
<!-- plugins start -->
<!-- plugins end -->
<!-- analytics start -->
<!-- website analytics start -->
<script type="text/javascript">
OV.SetWebsiteEventHandler ((eventName, eventLabel, eventParams) => {
console.log ({
@ -29,7 +29,7 @@
});
});
</script>
<!-- analytics end -->
<!-- website analytics end -->
<!-- website init start -->
<script type="text/javascript">