From 37023ea65e2aceef19de29b3b21d92d772b339ff Mon Sep 17 00:00:00 2001
From: Stefano D'Angelo <stefano.dangelo@orastron.com>
Date: Fri, 13 Dec 2024 14:28:39 +0100
Subject: [PATCH] back to web-demo/*extra.mk

---
 .../web-demo/{rules-extra-web-demo.mk => rules-extra.mk}      | 0
 templates/web-demo/tibia-index.js                             | 4 ++--
 templates/web-demo/{vars-extra-web-demo.mk => vars-extra.mk}  | 0
 test/rules-extra.mk                                           | 1 -
 test/run.sh                                                   | 2 +-
 test/vars-extra.mk                                            | 1 -
 6 files changed, 3 insertions(+), 5 deletions(-)
 rename templates/web-demo/{rules-extra-web-demo.mk => rules-extra.mk} (100%)
 rename templates/web-demo/{vars-extra-web-demo.mk => vars-extra.mk} (100%)
 delete mode 100644 test/rules-extra.mk
 delete mode 100644 test/vars-extra.mk

diff --git a/templates/web-demo/rules-extra-web-demo.mk b/templates/web-demo/rules-extra.mk
similarity index 100%
rename from templates/web-demo/rules-extra-web-demo.mk
rename to templates/web-demo/rules-extra.mk
diff --git a/templates/web-demo/tibia-index.js b/templates/web-demo/tibia-index.js
index a6782f5..9cefaa8 100644
--- a/templates/web-demo/tibia-index.js
+++ b/templates/web-demo/tibia-index.js
@@ -23,6 +23,6 @@ var sep = path.sep;
 
 module.exports = function (data, api) {
 	api.generateFileFromTemplateFile(`src${sep}index.html`, `src${sep}index.html`, data);
-	api.copyFile(`vars-extra-web-demo.mk`, `vars-extra-web-demo.mk`);
-	api.copyFile(`rules-extra-web-demo.mk`, `rules-extra-web-demo.mk`);
+	api.copyFile(`vars-extra.mk`, `vars-extra.mk`);
+	api.copyFile(`rules-extra.mk`, `rules-extra.mk`);
 };
diff --git a/templates/web-demo/vars-extra-web-demo.mk b/templates/web-demo/vars-extra.mk
similarity index 100%
rename from templates/web-demo/vars-extra-web-demo.mk
rename to templates/web-demo/vars-extra.mk
diff --git a/test/rules-extra.mk b/test/rules-extra.mk
deleted file mode 100644
index 1949e52..0000000
--- a/test/rules-extra.mk
+++ /dev/null
@@ -1 +0,0 @@
-include rules-extra-web-demo.mk
diff --git a/test/run.sh b/test/run.sh
index db3861f..30864a1 100755
--- a/test/run.sh
+++ b/test/run.sh
@@ -18,7 +18,7 @@ $dir/../tibia $dir/product.json,$dir/company.json $dir/../templates/web $dir/../
 $dir/../tibia $dir/product.json,$dir/company.json $dir/../templates/web-make $dir/../out/web
 $dir/../tibia $dir/product.json,$dir/company.json $dir/../templates/web-demo $dir/../out/web
 cp $dir/plugin.h $dir/../out/web/src
-cp $dir/vars-pre.mk $dir/vars-extra.mk $dir/rules-extra.mk $dir/../out/web
+cp $dir/vars-pre.mk $dir/../out/web
 
 $dir/../tibia $dir/product.json,$dir/company.json,$dir/android.json $dir/../templates/android $dir/../out/android
 $dir/../tibia $dir/product.json,$dir/company.json,$dir/android.json $dir/../templates/android-make $dir/../out/android
diff --git a/test/vars-extra.mk b/test/vars-extra.mk
deleted file mode 100644
index e39c2e6..0000000
--- a/test/vars-extra.mk
+++ /dev/null
@@ -1 +0,0 @@
-include vars-extra-web-demo.mk