shenshihai 2 gadi atpakaļ
vecāks
revīzija
efd5dd507d
2 mainītis faili ar 4 papildinājumiem un 1 dzēšanām
  1. 2 1
      src/PackageClass.php
  2. 2 0
      src/Utility.php

+ 2 - 1
src/PackageClass.php

@@ -401,11 +401,12 @@ class PackageClass
 		$rootDir = $packageInfo['rootDir'];
 		$macroFiles = $app["distribute-root"]["macro-files"] ? : array();
 		
+		$appDir = str_replace('\\','/',$rootDir);
 		$rootDirUp2 = dirname(dirname($rootDir));
 		$appdataDir = pathJoin($rootDirUp2,'appdata');
 		$tmpdataDir = pathJoin($rootDirUp2,'tmpdata');
 		$macros = array(
-			'{sis31.appdir}' => $rootDir,
+			'{sis31.appdir}' => $appDir,
 			'{sis31.appdata}' => $appdataDir,
 			'{sis31.tmpdata}' => $tmpdataDir,
 		);

+ 2 - 0
src/Utility.php

@@ -159,9 +159,11 @@ function filedirCopy(string $sourcePath, string $targetPath){
 //替换文件中的宏变量
 function replaceMacro(string $filePath,string $targetPath,array $macros){
 	$content = file_get_contents($filePath);
+	print($content.PHP_EOL);
 	foreach($macros as $key=>$value){
 		$content = str_replace($key,$value,$content);
 	}
+	print($content.PHP_EOL);
 	return file_put_contents($targetPath,$content);
 }