File tree Expand file tree Collapse file tree
utilities/script_builder/Common Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -171,8 +171,10 @@ function TBuilder.GetVariablesBash: String;
171171end ;
172172
173173function TBuilder.GetFunctionCompileBash (const AEntry: TEntry): String;
174+ { $IFDEF UNIX}
174175var
175176 lazbuild: String;
177+ { $ENDIF}
176178begin
177179 Result:= ' function ' + AEntry.EntryBinary + ' () {' + LineEnding;
178180 Result:= Result + ' echo "===== ' + UTF8Encode(AEntry.Name ) +' ======"' + LineEnding;
@@ -240,6 +242,14 @@ function TBuilder.GetFunctionCompileWindows(const AEntry: TEntry): String;
240242 Result:= ' :' + AEntry.EntryBinary + LineEnding;
241243 Result:= Result + ' echo ===== ' + UTF8Encode(AEntry.Name ) +' ======' + LineEnding;
242244 Result:= Result +
245+ ' del ' +
246+ ExpandFileName(
247+ ConcatPaths([
248+ FConfig.BinWindows,
249+ AEntry.EntryBinary
250+ ])
251+ ) + LineEnding;
252+ Result:= Result +
243253 ' msbuild /t:Build /p:Config=Release /p:platform=Linux64 ' +
244254 ExpandFileName(
245255 ConcatPaths([
@@ -248,7 +258,13 @@ function TBuilder.GetFunctionCompileWindows(const AEntry: TEntry): String;
248258 AEntry.DPROJ
249259 ])
250260 ) + LineEnding;
251- Result:= Result + ' if ERRORLEVEL 0 (' + LineEnding;
261+ Result:= Result + ' if EXIST ' +
262+ ExpandFileName(
263+ ConcatPaths([
264+ FConfig.BinWindows,
265+ AEntry.EntryBinary
266+ ])
267+ )+ ' (' + LineEnding;
252268 Result:= Result + ' echo -- Transfering --' + LineEnding;
253269 Result:= Result + ' scp ' +
254270 ExpandFileName(ConcatPaths([
You can’t perform that action at this time.
0 commit comments