Currently job artifacts in CI/CD pipelines on LRZ GitLab never expire. Starting from Wed 26.1.2022 the default expiration time will be 30 days (GitLab default). Currently existing artifacts in already completed jobs will not be affected by the change. The latest artifacts for all jobs in the latest successful pipelines will be kept. More information: https://gitlab.lrz.de/help/user/admin_area/settings/continuous_integration.html#default-artifacts-expiration

Commit d85723aa authored by Martin Ruckert's avatar Martin Ruckert
Browse files

moving the custom build step to the INPUT file adding MMIX_LOAD_FILE_LOC

parent eab59267
...@@ -185,10 +185,6 @@ ...@@ -185,10 +185,6 @@
> >
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="copying libconfig.cpu"
CommandLine="copy $(InputDir)libconfig.cpu $(InputDir)libconfig.h"
AdditionalDependencies="$(InputDir)libconfig.cpu"
Outputs="$(InputDir)libconfig.h"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
...@@ -196,16 +192,32 @@ ...@@ -196,16 +192,32 @@
> >
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="copying libconfig.cpu"
CommandLine="copy $(InputDir)libconfig.cpu $(InputDir)libconfig.h"
AdditionalDependencies="$(InputDir)libconfig.cpu"
Outputs="$(InputDir)libconfig.h"
/> />
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\mmixlib\libconfig.cpu" RelativePath="..\mmixlib\libconfig.cpu"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="copy libconfig.cpu to libconfig.h"
CommandLine="copy $(InputDir)libconfig.cpu $(InputDir)libconfig.h"
Outputs="$(InputDir)libconfig.h"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="copy libconfig.cpu to libconfig.h"
CommandLine="copy $(InputDir)libconfig.cpu $(InputDir)libconfig.h"
Outputs="$(InputDir)libconfig.h"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\mmixlib\libimport.h" RelativePath="..\mmixlib\libimport.h"
...@@ -215,10 +227,6 @@ ...@@ -215,10 +227,6 @@
> >
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="copying libimport.cpu"
CommandLine="copy $(InputDir)libimport.cpu $(InputDir)libimport.h&#x0D;&#x0A;"
AdditionalDependencies="$(InputDir)libimport.cpu"
Outputs="$(InputDir)libimport.h"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
...@@ -226,16 +234,32 @@ ...@@ -226,16 +234,32 @@
> >
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="copying libimport.cpu"
CommandLine="copy $(InputDir)libimport.cpu $(InputDir)libimport.h&#x0D;&#x0A;"
AdditionalDependencies="$(InputDir)libimport.cpu"
Outputs="$(InputDir)libimport.h"
/> />
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\mmixlib\libimport.cpu" RelativePath="..\mmixlib\libimport.cpu"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="copy libimport.cpu to libimport.h"
CommandLine="copy $(InputDir)libimport.cpu $(InputDir)libimport.h"
Outputs="$(InputDir)libimport.h"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="copy libimport.cpu to libimport.h"
CommandLine="copy $(InputDir)libimport.cpu $(InputDir)libimport.h"
Outputs="$(InputDir)libimport.h"
/>
</FileConfiguration>
</File> </File>
</Filter> </Filter>
<Filter <Filter
......
...@@ -185,10 +185,6 @@ ...@@ -185,10 +185,6 @@
> >
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="copying libconfig.gdb"
CommandLine="copy $(InputDir)libconfig.gdb $(InputDir)libconfig.h"
AdditionalDependencies="$(InputDir)libconfig.gdb"
Outputs="$(InputDir)libconfig.h"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
...@@ -196,16 +192,32 @@ ...@@ -196,16 +192,32 @@
> >
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="copying libconfig.gdb"
CommandLine="copy $(InputDir)libconfig.gdb $(InputDir)libconfig.h"
AdditionalDependencies="$(InputDir)libconfig.gdb"
Outputs="$(InputDir)libconfig.h"
/> />
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\mmixlib\libconfig.gdb" RelativePath="..\mmixlib\libconfig.gdb"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="copy libconfig.gdb to libconfig.h"
CommandLine="copy $(InputDir)libconfig.gdb $(InputDir)libconfig.h"
Outputs="$(InputDir)libconfig.h"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="copy libconfig.gdb to libconfig.h"
CommandLine="copy $(InputDir)libconfig.gdb $(InputDir)libconfig.h"
Outputs="$(InputDir)libconfig.h"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\mmixlib\libimport.h" RelativePath="..\mmixlib\libimport.h"
...@@ -215,10 +227,6 @@ ...@@ -215,10 +227,6 @@
> >
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="copying libimport.gdb"
CommandLine="copy $(InputDir)libimport.gdb $(InputDir)libimport.h&#x0D;&#x0A;"
AdditionalDependencies="$(InputDir)libimport.gdb"
Outputs="$(InputDir)libimport.h"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
...@@ -226,16 +234,32 @@ ...@@ -226,16 +234,32 @@
> >
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="copying libimport.gdb"
CommandLine="copy $(InputDir)libimport.gdb $(InputDir)libimport.h&#x0D;&#x0A;"
AdditionalDependencies="$(InputDir)libimport.gdb"
Outputs="$(InputDir)libimport.h"
/> />
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\mmixlib\libimport.gdb" RelativePath="..\mmixlib\libimport.gdb"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="copy libimport.gdb to libimport.h"
CommandLine="copy $(InputDir)libimport.gdb $(InputDir)libimport.h"
Outputs="$(InputDir)libimport.h"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="copy libimport.gdb to libimport.h"
CommandLine="copy $(InputDir)libimport.gdb $(InputDir)libimport.h"
Outputs="$(InputDir)libimport.h"
/>
</FileConfiguration>
</File> </File>
</Filter> </Filter>
<Filter <Filter
......
...@@ -185,10 +185,6 @@ ...@@ -185,10 +185,6 @@
> >
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="copying libconfig.ide"
CommandLine="copy $(InputDir)libconfig.ide $(InputDir)libconfig.h"
AdditionalDependencies="$(InputDir)libconfig.ide"
Outputs="$(InputDir)libconfig.h"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
...@@ -196,16 +192,32 @@ ...@@ -196,16 +192,32 @@
> >
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="copying libconfig.ide"
CommandLine="copy $(InputDir)libconfig.ide $(InputDir)libconfig.h"
AdditionalDependencies="$(InputDir)libconfig.ide"
Outputs="$(InputDir)libconfig.h"
/> />
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\mmixlib\libconfig.ide" RelativePath="..\mmixlib\libconfig.ide"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="copy libconfig.ide to libconfig.h"
CommandLine="copy $(InputDir)libconfig.ide $(InputDir)libconfig.h"
Outputs="$(InputDir)libconfig.h"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="copy libconfig.ide to libconfig.h"
CommandLine="copy $(InputDir)libconfig.ide $(InputDir)libconfig.h"
Outputs="$(InputDir)libconfig.h"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\mmixlib\libimport.h" RelativePath="..\mmixlib\libimport.h"
...@@ -215,10 +227,6 @@ ...@@ -215,10 +227,6 @@
> >
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="copying libimport.ide"
CommandLine="copy $(InputDir)libimport.ide $(InputDir)libimport.h&#x0D;&#x0A;"
AdditionalDependencies="$(InputDir)libimport.ide"
Outputs="$(InputDir)libimport.h"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
...@@ -226,16 +234,32 @@ ...@@ -226,16 +234,32 @@
> >
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="copying libimport.ide"
CommandLine="copy $(InputDir)libimport.ide $(InputDir)libimport.h&#x0D;&#x0A;"
AdditionalDependencies="$(InputDir)libimport.ide"
Outputs="$(InputDir)libimport.h"
/> />
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\mmixlib\libimport.ide" RelativePath="..\mmixlib\libimport.ide"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="copy libimport.ide to libimport.h"
CommandLine="copy $(InputDir)libimport.ide $(InputDir)libimport.h"
Outputs="$(InputDir)libimport.h"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="copy libimport.ide to libimport.h"
CommandLine="copy $(InputDir)libimport.ide $(InputDir)libimport.h"
Outputs="$(InputDir)libimport.h"
/>
</FileConfiguration>
</File> </File>
</Filter> </Filter>
<Filter <Filter
......
...@@ -185,10 +185,6 @@ ...@@ -185,10 +185,6 @@
> >
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description=""
CommandLine=""
AdditionalDependencies=""
Outputs=""
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
...@@ -196,10 +192,6 @@ ...@@ -196,10 +192,6 @@
> >
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description=""
CommandLine=""
AdditionalDependencies=""
Outputs=""
/> />
</FileConfiguration> </FileConfiguration>
</File> </File>
...@@ -235,10 +227,6 @@ ...@@ -235,10 +227,6 @@
> >
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="copying libimport.vd"
CommandLine="copy $(InputDir)libimport.vd $(InputDir)libimport.h&#x0D;&#x0A;"
AdditionalDependencies="$(InputDir)libimport.vd"
Outputs="$(InputDir)libimport.h"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
...@@ -246,10 +234,6 @@ ...@@ -246,10 +234,6 @@
> >
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="copying libimport.vd"
CommandLine="copy $(InputDir)libimport.vd $(InputDir)libimport.h&#x0D;&#x0A;"
AdditionalDependencies="$(InputDir)libimport.vd"
Outputs="$(InputDir)libimport.h"
/> />
</FileConfiguration> </FileConfiguration>
</File> </File>
......
...@@ -96,5 +96,7 @@ ...@@ -96,5 +96,7 @@
/* define this to record file line and location associations while assembling */ /* define this to record file line and location associations while assembling */
#define MMIXAL_LINE_LOC(file_no,line_no,cur_loc) #define MMIXAL_LINE_LOC(file_no,line_no,cur_loc)
/* define this to record file line and location associations while loading mmo files */
#define MMIX_LOAD_LINE_LOC(file_no,line_no,cur_loc)
#endif #endif
...@@ -96,5 +96,7 @@ ...@@ -96,5 +96,7 @@
/* define this to record file line and location associations while assembling */ /* define this to record file line and location associations while assembling */
#define MMIXAL_LINE_LOC(file_no,line_no,cur_loc) #define MMIXAL_LINE_LOC(file_no,line_no,cur_loc)
/* define this to record file line and location associations while loading mmo files */
#define MMIX_LOAD_LINE_LOC(file_no,line_no,cur_loc)
#endif #endif
...@@ -110,8 +110,7 @@ extern int mmix_fputc(int c, FILE *f); ...@@ -110,8 +110,7 @@ extern int mmix_fputc(int c, FILE *f);
/* define this to record file line and location associations while assembling */ /* define this to record file line and location associations while assembling */
#define MMIXAL_LINE_LOC(file_no,line_no,cur_loc) add_line_loc(file_no,line_no,cur_loc) #define MMIXAL_LINE_LOC(file_no,line_no,cur_loc) add_line_loc(file_no,line_no,cur_loc)
/* define this to record file line and location associations while loading mmo files /* define this to record file line and location associations while loading mmo files */
undefine to get the default behaviour of recording this info in the mem_tetra */
#define MMIX_LOAD_LINE_LOC(file_no,line_no,cur_loc) add_line_loc(file_no,line_no,cur_loc) #define MMIX_LOAD_LINE_LOC(file_no,line_no,cur_loc) add_line_loc(file_no,line_no,cur_loc)
#endif #endif
...@@ -86,5 +86,6 @@ extern int mmix_fputc(int c, FILE *f); ...@@ -86,5 +86,6 @@ extern int mmix_fputc(int c, FILE *f);
/* define this to record file line and location associations while assembling */ /* define this to record file line and location associations while assembling */
#define MMIXAL_LINE_LOC(file_no,line_no,cur_loc) #define MMIXAL_LINE_LOC(file_no,line_no,cur_loc)
/* define this to record file line and location associations while loading mmo files */
#define MMIX_LOAD_LINE_LOC(file_no,line_no,cur_loc)
#endif #endif
\ No newline at end of file
...@@ -6,3 +6,6 @@ ...@@ -6,3 +6,6 @@
extern void win32_log(char *msg); extern void win32_log(char *msg);
extern void win32_ferror(int line, char *format, char *str); extern void win32_ferror(int line, char *format, char *str);
extern void win32_message(char *msg); extern void win32_message(char *msg);
extern void add_line_loc(int file_no, int line_no, octa loc);
/* report the association of a file/line with a location */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment