Merge branch 'master' of https://git.boerchers.org/holger/Katteker
This commit is contained in:
@ -56,7 +56,7 @@ namespace KattekerCreator
|
||||
//Modify AppStub
|
||||
var appStubFile = ModifyAppStub();
|
||||
//Acquire infos from Executable.
|
||||
_assemblyFileInfo = new AssemblyFileInfo(_appArguments.ProgramFile, _tempDir);
|
||||
_assemblyFileInfo = new AssemblyFileInfo(_appArguments, _tempDir);
|
||||
var configFile = CreateConfigFile();
|
||||
|
||||
//Generate NSIS-Script
|
||||
@ -109,9 +109,10 @@ namespace KattekerCreator
|
||||
if (!Directory.Exists(_appArguments.OutputDir)) Directory.CreateDirectory(_appArguments.OutputDir);
|
||||
if (!string.IsNullOrEmpty(_appArguments.ChangeLog))
|
||||
{
|
||||
var changeLogPath = Path.Combine(Path.GetDirectoryName(_appArguments.ProgramFile), _appArguments.ChangeLog);
|
||||
if (!File.Exists(changeLogPath)) throw new FileNotFoundException(changeLogPath);
|
||||
File.Copy(changeLogPath, Path.Combine(_appArguments.OutputDir, _appArguments.ChangeLog), true);
|
||||
var changeLogFilename = Path.GetFileName(_appArguments.ChangeLog);
|
||||
|
||||
if (!File.Exists(_appArguments.ChangeLog)) throw new FileNotFoundException(_appArguments.ChangeLog);
|
||||
File.Copy(_appArguments.ChangeLog, Path.Combine(_appArguments.OutputDir, changeLogFilename), true);
|
||||
}
|
||||
File.Copy(setupFilePath, Path.Combine(_appArguments.OutputDir, setupFile), true);
|
||||
}
|
||||
@ -145,7 +146,7 @@ namespace KattekerCreator
|
||||
var kattekerConfig = new KattekerConfig
|
||||
{
|
||||
Publish = _appArguments.PublishDir ?? _appArguments.OutputDir,
|
||||
Changelog = _appArguments.ChangeLog
|
||||
Changelog = Path.GetFileName(_appArguments.ChangeLog)
|
||||
};
|
||||
kattekerConfig.WriteToFile(pathToFile);
|
||||
return pathToFile;
|
||||
|
Reference in New Issue
Block a user