[Scummvm-git-logs] scummvm-web master -> 12c1e58fe5683288b147fff0e5c252de6ef7ed5a

[Mataniko]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm-web' repo located at https://github.com/scummvm/scummvm-web .

Summary:
12c1e58fe5 BUILD: Fix image map generation


Commit: 12c1e58fe5683288b147fff0e5c252de6ef7ed5a
    https://github.com/scummvm/scummvm-web/commit/12c1e58fe5683288b147fff0e5c252de6ef7ed5a
Author: Matan Bareket (mataniko at gmail.com)
Date: 2019-04-27T02:04:21-04:00

Commit Message:
BUILD: Fix image map generation

Changed paths:
  A public_html/browserconfig.xml
  A public_html/robots.txt
  R browserconfig.xml
  R robots.txt
    composer.json


diff --git a/browserconfig.xml b/browserconfig.xml
deleted file mode 100644
index 65b8900..0000000
--- a/browserconfig.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<browserconfig>
-    <msapplication>
-        <tile>
-            <square150x150logo src="/mstile-150x150.png"/>
-            <TileColor>#cc6600</TileColor>
-        </tile>
-    </msapplication>
-</browserconfig>
diff --git a/composer.json b/composer.json
index 133b1cd..178c43c 100644
--- a/composer.json
+++ b/composer.json
@@ -1,63 +1,65 @@
 {
-    "name": "scummvm/web",
-    "description": "Scummvm.org main site",
-    "type": "project",
-    "authors": [
-        {
-            "name": "Matan Bareket",
-            "email": "mataniko at scummvm.org"
-        }
-    ],
-    "require": {
-        "leafo/scssphp": "^0.7.6",
-        "smarty/smarty": "^3.1",
-        "ezyang/htmlpurifier": "^4.10",
-        "altorouter/altorouter": "^1.2"
-    },
-    "scripts": {
-      "post-install-cmd": [
-        "pscss -f compressed ./scss/main.scss > ./public_html/css/main.css",
-        "pscss -f compressed ./scss/pages/_cloud-style.scss > ./public_html/css/cloud-style.css",
-        "pscss -f compressed ./scss/pages/_mirrorbrain.scss > ./public_html/css/mirrorbrain.css",
-        "php include/I18N.php"
-      ],
-      "build-common": [
-        "glue data/icons/games/ --img=public_html/images/ --scss=scss/sprites/ --retina",
-        "glue data/icons/platforms/ --img=public_html/images/ --scss=scss/sprites/ --retina",
-        "mv scss/sprites/games.scss scss/sprites/_games.scss",
-        "mv scss/sprites/platforms.scss scss/sprites/_platforms.scss",
-        "composer install --no-dev",
-        "npm install --production"
-      ],
-      "build-win":[
-        "if NOT EXIST public_html\\css mkdir public_html\\css",
-        "@build-common",
-        "if NOT EXIST templates\\compiled mkdir templates\\compiled"
-      ],
-      "build": [
-        "mkdir public_html/css -p",
-        "@build-common",
-        "mkdir templates/compiled -p"
-      ],
-      "run": [
-        "php -S localhost:8000 -t ./public_html"
-      ],
-      "develop": [
-        "@build",
-        "@run"
-      ],
-      "develop-win": [
-        "@build-win",
-        "@run"
-      ]
-    },
-    "require-dev": {
-        "phpstan/phpstan": "^0.11.1",
-        "squizlabs/php_codesniffer": "^3.4"
-    },
-    "autoload": {
-      "psr-4": {
-        "ScummVM\\": [ "include/", "public_html/index.php"]
+  "name": "scummvm/web",
+  "description": "Scummvm.org main site",
+  "type": "project",
+  "authors": [
+      {
+          "name": "Matan Bareket",
+          "email": "mataniko at scummvm.org"
       }
+  ],
+  "require": {
+      "leafo/scssphp": "^0.7.6",
+      "smarty/smarty": "^3.1",
+      "ezyang/htmlpurifier": "^4.10",
+      "altorouter/altorouter": "^1.2"
+  },
+  "scripts": {
+    "post-install-cmd": [
+      "pscss -f compressed ./scss/main.scss > ./public_html/css/main.css",
+      "pscss -f compressed ./scss/pages/_cloud-style.scss > ./public_html/css/cloud-style.css",
+      "pscss -f compressed ./scss/pages/_mirrorbrain.scss > ./public_html/css/mirrorbrain.css",
+      "php include/I18N.php"
+    ],
+    "build-common": [
+      "glue data/icons/games/ --img=images/ --scss=scss/sprites/ --retina",
+      "glue data/icons/platforms/ --img=images/ --scss=scss/sprites/ --retina",
+      "mv scss/sprites/games.scss scss/sprites/_games.scss",
+      "mv scss/sprites/platforms.scss scss/sprites/_platforms.scss",
+      "mv images/*.png public_html/images",
+      "rm -rf images",
+      "composer install --no-dev",
+      "npm install --production"
+    ],
+    "build-win":[
+      "if NOT EXIST public_html\\css mkdir public_html\\css",
+      "@build-common",
+      "if NOT EXIST templates\\compiled mkdir templates\\compiled"
+    ],
+    "build": [
+      "mkdir public_html/css -p",
+      "@build-common",
+      "mkdir templates/compiled -p"
+    ],
+    "run": [
+      "php -S localhost:8000 -t ./public_html"
+    ],
+    "develop": [
+      "@build",
+      "@run"
+    ],
+    "develop-win": [
+      "@build-win",
+      "@run"
+    ]
+  },
+  "require-dev": {
+      "phpstan/phpstan": "^0.11.1",
+      "squizlabs/php_codesniffer": "^3.4"
+  },
+  "autoload": {
+    "psr-4": {
+      "ScummVM\\": [ "include/", "public_html/index.php"]
     }
+  }
 }
diff --git a/public_html/browserconfig.xml b/public_html/browserconfig.xml
new file mode 100644
index 0000000..65b8900
--- /dev/null
+++ b/public_html/browserconfig.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+    <msapplication>
+        <tile>
+            <square150x150logo src="/mstile-150x150.png"/>
+            <TileColor>#cc6600</TileColor>
+        </tile>
+    </msapplication>
+</browserconfig>
diff --git a/public_html/robots.txt b/public_html/robots.txt
new file mode 100644
index 0000000..aad2803
--- /dev/null
+++ b/public_html/robots.txt
@@ -0,0 +1,6 @@
+User-agent: *
+Disallow: /frs
+Disallow: /downloads
+
+User-agent: SemrushBot
+Disallow: /
diff --git a/robots.txt b/robots.txt
deleted file mode 100644
index aad2803..0000000
--- a/robots.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-User-agent: *
-Disallow: /frs
-Disallow: /downloads
-
-User-agent: SemrushBot
-Disallow: /