1
0
mirror of https://github.com/e107inc/e107.git synced 2025-01-31 04:07:55 +01:00

Moved placeholder core_image.phar to e107_system

Also made naming of "core_image.phar" consistent everywhere
This commit is contained in:
Nick Liu 2020-05-11 15:34:16 -05:00
parent e7a79edcd0
commit 2e0664dad4
No known key found for this signature in database
GPG Key ID: 1167C5F9C9897637
3 changed files with 5 additions and 5 deletions

View File

@ -49,7 +49,6 @@ exclude_patterns:
- "**/tests/" - "**/tests/"
- "**/vendor/" - "**/vendor/"
- "**/*.d.ts" - "**/*.d.ts"
- "e107_admin/core_image.php"
- "e107_plugins/log/js/awesomechart.js" - "e107_plugins/log/js/awesomechart.js"
- "e107_core/**/*.sc" - "e107_core/**/*.sc"
- "e107_docs/**/*" - "e107_docs/**/*"
@ -59,6 +58,7 @@ exclude_patterns:
- "e107_handlers/phpmailer/**/*" - "e107_handlers/phpmailer/**/*"
- "e107_handlers/phpthumb/**/*" - "e107_handlers/phpthumb/**/*"
- "e107_handlers/xmlrpc/**/*" - "e107_handlers/xmlrpc/**/*"
- "e107_system/core_image.phar"
- "e107_web/**/*" - "e107_web/**/*"
- "e107_tests/tests/**/*" - "e107_tests/tests/**/*"
# Ignore symlinks that are allowed to be broken due to local configurations # Ignore symlinks that are allowed to be broken due to local configurations

View File

@ -276,7 +276,7 @@ class e107Build
$releaseDir = "{$this->config['baseDir']}/target/{$this->config['main']['name']}/release/" . $this->releaseDir; $releaseDir = "{$this->config['baseDir']}/target/{$this->config['main']['name']}/release/" . $this->releaseDir;
$this->copyCoreImage($releaseDir . "/core_image.php"); $this->copyCoreImage($releaseDir . "/core_image.phar");
/** /**
* git archive -o update.zip HEAD $(git diff --name-only [id]) * git archive -o update.zip HEAD $(git diff --name-only [id])
@ -483,9 +483,9 @@ class e107Build
//create new image file - writes directly to cvsroot //create new image file - writes directly to cvsroot
$this->changeDir($this->config['baseDir']); $this->changeDir($this->config['baseDir']);
$imageFile = $this->tempDir . "core_image.php"; $imageFile = $this->tempDir . "core_image.phar";
$this->status("Creating new core_image.php file ({$imageFile})", true); $this->status("Creating new core_image.phar file ({$imageFile})", true);
new JsonPharCoreImage($this->exportDir, $this->tempDir, $this->version, $imageFile); new JsonPharCoreImage($this->exportDir, $this->tempDir, $this->version, $imageFile);
$dir = "{$this->config['baseDir']}/target/{$this->config['main']['name']}/export"; $dir = "{$this->config['baseDir']}/target/{$this->config['main']['name']}/export";
@ -494,7 +494,7 @@ class e107Build
private function copyCoreImage($destination) private function copyCoreImage($destination)
{ {
$source = $this->tempDir . "core_image.php"; $source = $this->tempDir . "core_image.phar";
if (!file_exists($source)) if (!file_exists($source))
{ {