Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[mono] Add headers for unstable APIs #33869

Merged
merged 2 commits into from
Mar 23, 2020
Merged

[mono] Add headers for unstable APIs #33869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03b9ee4
[mono] Add headers for unstable APIs
lambdageek Mar 20, 2020
34c3ceb
[msvc] Add the three mono-private-unstable.h files
lambdageek Mar 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/mono/mono/metadata/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,7 @@ libmonoruntimeinclude_HEADERS = \
mono-config.h \
mono-debug.h \
mono-gc.h \
mono-private-unstable.h \
object.h \
object-forward.h \
opcodes.h \
Expand Down
19 changes: 19 additions & 0 deletions src/mono/mono/metadata/mono-private-unstable.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/**
* \file
*
* Private unstable APIs.
*
* WARNING: The declarations and behavior of functions in this header are NOT STABLE and can be modified or removed at
* any time.
*
*/


#ifndef __MONO_METADATA_MONO_PRIVATE_UNSTABLE_H__
#define __MONO_METADATA_MONO_PRIVATE_UNSTABLE_H__

#include <mono/utils/mono-publib.h>



#endif /*__MONO_METADATA_MONO_PRIVATE_UNSTABLE_H__*/
4 changes: 3 additions & 1 deletion src/mono/mono/mini/Makefile.am.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -783,7 +783,9 @@ libmonoincludedir = $(includedir)/mono-$(API_VER)/mono/jit
# These are public headers.
# They should not use glib.h, G_BEGIN_DECLS, guint, etc.
# They should be wrapped in MONO_BEGIN_DECLS / MONO_END_DECLS.
libmonoinclude_HEADERS = jit.h
libmonoinclude_HEADERS = \
jit.h \
mono-private-unstable.h

CSFLAGS = -unsafe -nowarn:0219,0169,0414,0649,0618

Expand Down
19 changes: 19 additions & 0 deletions src/mono/mono/mini/mono-private-unstable.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/**
* \file
*
* Private unstable APIs.
*
* WARNING: The declarations and behavior of functions in this header are NOT STABLE and can be modified or removed at
* any time.
*
*/


#ifndef __MONO_JIT_MONO_PRIVATE_UNSTABLE_H__
#define __MONO_JIT_MONO_PRIVATE_UNSTABLE_H__

#include <mono/utils/mono-publib.h>



#endif /*__MONO_JIT_MONO_PRIVATE_UNSTABLE_H__*/
1 change: 1 addition & 0 deletions src/mono/mono/utils/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,7 @@ libmonoutilsinclude_HEADERS = \
mono-publib.h \
mono-jemalloc.h \
mono-dl-fallback.h \
mono-private-unstable.h \
mono-counters.h

EXTRA_DIST = mono-errno.h mono-embed.h mono-embed.c ../../support/libm/complex.c mono-experiments.def
Expand Down
19 changes: 19 additions & 0 deletions src/mono/mono/utils/mono-private-unstable.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/**
* \file
*
* Private unstable APIs.
*
* WARNING: The declarations and behavior of functions in this header are NOT STABLE and can be modified or removed at
* any time.
*
*/


#ifndef __MONO_UTILS_MONO_PRIVATE_UNSTABLE_H__
#define __MONO_UTILS_MONO_PRIVATE_UNSTABLE_H__

#include <mono/utils/mono-publib.h>



#endif /*__MONO_UTILS_MONO_PRIVATE_UNSTABLE_H__*/
12 changes: 10 additions & 2 deletions src/mono/msvc/libmono.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ metadata.h ^
mono-config.h ^
mono-debug.h ^
mono-gc.h ^
mono-private-unstable.h ^
object.h ^
object-forward.h ^
opcodes.h ^
Expand All @@ -88,15 +89,22 @@ mono-error.h ^
mono-forward.h ^
mono-jemalloc.h ^
mono-logger.h ^
mono-private-unstable.h ^
mono-publib.h

SET JIT_FILES=^
jit.h ^
mono-private-unstable.h

ECHO Copying mono include files from %SOURCE_ROOT% to %TARGET_ROOT% ...

SET RUN=%XCOPY_COMMAND% "%SOURCE_ROOT%\cil\opcode.def" "%TARGET_ROOT%\cil\" %OPTIONS%
call :runCommand "%RUN%" %ARGUMENTS%

SET RUN=%XCOPY_COMMAND% "%SOURCE_ROOT%\mini\jit.h" "%TARGET_ROOT%\jit\" %OPTIONS%
call :runCommand "%RUN%" %ARGUMENTS%
FOR %%a IN (%JIT_FILES%) DO (
SET RUN=%XCOPY_COMMAND% "%SOURCE_ROOT%\mini\%%a" "%TARGET_ROOT%\jit\" %OPTIONS%
call :runCommand "!RUN!" %ARGUMENTS%
)

FOR %%a IN (%META_DATA_FILES%) DO (
SET RUN=%XCOPY_COMMAND% "%SOURCE_ROOT%\metadata\%%a" "%TARGET_ROOT%\metadata\" %OPTIONS%
Expand Down
1 change: 1 addition & 0 deletions src/mono/msvc/libmonoruntime-common.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@
<ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-config.h" />
<ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-debug.h" />
<ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-gc.h" />
<ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-private-unstable.h" />
<ClInclude Include="$(MonoSourceLocation)\mono\metadata\sgen-bridge.h" />
<ClInclude Include="$(MonoSourceLocation)\mono\metadata\object.h" />
<ClInclude Include="$(MonoSourceLocation)\mono\metadata\opcodes.h" />
Expand Down
3 changes: 3 additions & 0 deletions src/mono/msvc/libmonoruntime-common.targets.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -675,6 +675,9 @@
<ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-gc.h">
<Filter>Header Files$(MonoRuntimeFilterSubFolder)\common\public</Filter>
</ClInclude>
<ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-private-unstable.h">
<Filter>Header Files$(MonoRuntimeFilterSubFolder)\common\public</Filter>
</ClInclude>
<ClInclude Include="$(MonoSourceLocation)\mono\metadata\sgen-bridge.h">
<Filter>Header Files$(MonoRuntimeFilterSubFolder)\common\public</Filter>
</ClInclude>
Expand Down
1 change: 1 addition & 0 deletions src/mono/msvc/libmonoutils-common.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@
<ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-logger.h" />
<ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-error.h" />
<ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-publib.h" />
<ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-private-unstable.h" />
<ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-dl-fallback.h" />
<ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-counters.h" />
</ItemGroup>
Expand Down
3 changes: 3 additions & 0 deletions src/mono/msvc/libmonoutils-common.targets.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,6 +492,9 @@
<ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-logger.h">
<Filter>Header Files$(MonoUtilsFilterSubFolder)\common\public</Filter>
</ClInclude>
<ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-private-unstable.h">
<Filter>Header Files$(MonoUtilsFilterSubFolder)\common\public</Filter>
</ClInclude>
<ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-error.h">
<Filter>Header Files$(MonoUtilsFilterSubFolder)\common\public</Filter>
</ClInclude>
Expand Down