From 9ca0e3965adb12d1c0a85600b8191ebed678fa3b Mon Sep 17 00:00:00 2001 From: ChenPi11 Date: Sat, 28 Dec 2024 23:37:17 +0800 Subject: [PATCH 1/5] Split `__has_bsd__` to FreeBSD, NetBSD, OpenBSD, BSDI and DragonFly. 1. Split `__has_bsd__` to FreeBSD, NetBSD, OpenBSD, BSDI and DragonFly. 2. Move `doc` to `docs`. --- .github/workflows/build.yml | 4 ++-- README.md | 2 +- {doc => docs}/architectures.md | 0 {doc => docs}/compilers.md | 0 doc/doc.md => docs/docs.md | 0 {doc => docs}/languagestandards.md | 0 {doc => docs}/platforms.md | 5 ++++ src/platforms.h | 37 +++++++++++++++++++++++++++++- 8 files changed, 44 insertions(+), 4 deletions(-) rename {doc => docs}/architectures.md (100%) rename {doc => docs}/compilers.md (100%) rename doc/doc.md => docs/docs.md (100%) rename {doc => docs}/languagestandards.md (100%) rename {doc => docs}/platforms.md (94%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5ffd0bf..a094ecf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,13 +31,13 @@ jobs: - name: 🛠️ Build distribution run: | rubisco build - + - name: 📦 Make packages run: | cd dist for i in $(ls) ; do sha256sum $i > $i.sha256 ; done cd .. - + #--------------------------------------------publish-------------------------------------------- - name: ⬆️ Create release and upload assets diff --git a/README.md b/README.md index 84776e4..4235f31 100644 --- a/README.md +++ b/README.md @@ -19,4 +19,4 @@ cmake --install . ## Documentation -[Documentation](doc/doc.md) +[Documentation](docs/docs.md) diff --git a/doc/architectures.md b/docs/architectures.md similarity index 100% rename from doc/architectures.md rename to docs/architectures.md diff --git a/doc/compilers.md b/docs/compilers.md similarity index 100% rename from doc/compilers.md rename to docs/compilers.md diff --git a/doc/doc.md b/docs/docs.md similarity index 100% rename from doc/doc.md rename to docs/docs.md diff --git a/doc/languagestandards.md b/docs/languagestandards.md similarity index 100% rename from doc/languagestandards.md rename to docs/languagestandards.md diff --git a/doc/platforms.md b/docs/platforms.md similarity index 94% rename from doc/platforms.md rename to docs/platforms.md index 8621c66..e98cff1 100644 --- a/doc/platforms.md +++ b/docs/platforms.md @@ -33,6 +33,11 @@ The 'xxx' here refers to the OS name, and details can be found in the `src/platf | BeOS | \_\_has_beos\_\_ | | Blue Gene | \_\_has_blue_gene\_\_ | | BSD | \_\_has_bsd\_\_ | +| FreeBSD | \_\_has_freebsd\_\_ | +| NetBSD | \_\_has_netbsd\_\_ | +| OpenBSD | \_\_has_openbsd\_\_ | +| BSDI | \_\_has_bsdi\_\_ | +| DragonFly BSD | \_\_has_dragonfly\_\_ | | ConvexOS | \_\_has_convex\_\_ | | Cygwin Environment | \_\_has_cygwin\_\_ | | DG/UX | \_\_has_dgux\_\_ | diff --git a/src/platforms.h b/src/platforms.h index 74777d2..bef1cae 100644 --- a/src/platforms.h +++ b/src/platforms.h @@ -16,6 +16,16 @@ #define __has_blue_gene__ 0 /* No BSD */ #define __has_bsd__ 0 +/* No FreeBSD */ +#define __has_freebsd__ 0 +/* No NetBSD */ +#define __has_netbsd__ 0 +/* No OpenBSD */ +#define __has_openbsd__ 0 +/* No BSDI */ +#define __has_bsdi__ 0 +/* No DragonFly */ +#define __has_dragonfly__ 0 /* No ConvexOS */ #define __has_convex__ 0 /* No Cygwin Environment */ @@ -157,7 +167,32 @@ /* Has Blue Gene */ #define __has_blue_gene__ 1 #endif -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__DragonFly__) +#if defined(__FreeBSD__) +#undef __has_freebsd__ +/* Has FreeBSD */ +#define __has_freebsd__ 1 +#endif +#if defined(__NetBSD__) +#undef __has_netbsd__ +/* Has NetBSD */ +#define __has_netbsd__ 1 +#endif +#if defined(__OpenBSD__) +#undef __has_openbsd__ +/* Has OpenBSD */ +#define __has_openbsd__ 1 +#endif +#if defined(__bsdi__) +#undef __has_bsdi__ +/* Has BSDI */ +#define __has_bsdi__ 1 +#endif +#if defined(__DragonFly__) +#undef __has_dragonfly__ +/* Has DragonFly */ +#define __has_dragonfly__ 1 +#endif +#if __has_freebsd__ || __has_netbsd__ || __has_openbsd__ || __has_bsdi__ || __has_dragonfly__ #undef __has_bsd__ /* Has BSD */ #define __has_bsd__ 1 From feaec57e9586a119795713acc8a493d464735a33 Mon Sep 17 00:00:00 2001 From: ChenPi11 Date: Sat, 28 Dec 2024 23:43:16 +0800 Subject: [PATCH 2/5] add `defined(unix)` for unix platform. --- src/platforms.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/platforms.h b/src/platforms.h index bef1cae..892fd55 100644 --- a/src/platforms.h +++ b/src/platforms.h @@ -300,7 +300,7 @@ /* Has MPE/iX */ #define __has_mpe_ix__ 1 #endif -#if defined(MSDOS) || defined(__MSDOS__) || defined(_MSDOS) || defined( __DOS__) +#if defined(MSDOS) || defined(__MSDOS__) || defined(_MSDOS) || defined(__DOS__) #undef __has_dos__ /* Has MSDOS (C++ Plus C unsupport platform) */ #define __has_dos__ 1 @@ -399,7 +399,7 @@ /* Has UNICOS/mp */ #define __has_unicos_mp__ 1 #endif -#if defined(__unix__) || defined(__unix) +#if defined(__unix__) || defined(__unix) || defined(unix) #undef __has_unix__ /* Has UNIX Enviroment */ #define __has_unix__ 1 From b170759d9888c794ddc4eaced563a9827082e216 Mon Sep 17 00:00:00 2001 From: ChenPi11 Date: Sun, 12 Jan 2025 10:40:01 +0800 Subject: [PATCH 3/5] Fix a typo. --- src/platforms.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/platforms.h b/src/platforms.h index 892fd55..ada58d0 100644 --- a/src/platforms.h +++ b/src/platforms.h @@ -42,7 +42,7 @@ #define __has_haiku__ 0 /* No HI-UX MPP */ #define __has_hiux_mpp__ 0 -/* No HP-US */ +/* No HP-UX */ #define __has_hpux__ 0 /* No IBM OS/400 */ #define __has_os_400__ 0 @@ -238,7 +238,7 @@ #endif #if defined(_hpux) || defined(hpux) || defined(__hpux) #undef __has_hpux__ -/* Has HP-US */ +/* Has HP-UX */ #define __has_hpux__ 1 #endif #if defined(__OS400__) || defined(__OS400_TGTVRM__) From bbf4597b31c64d31ef9cfb0c9dd9fd9ca3364d2f Mon Sep 17 00:00:00 2001 From: ChenPi11 Date: Sun, 12 Jan 2025 10:41:49 +0800 Subject: [PATCH 4/5] Fix a typo in OSF/1 platform. --- src/platforms.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/platforms.h b/src/platforms.h index ada58d0..519ced5 100644 --- a/src/platforms.h +++ b/src/platforms.h @@ -101,7 +101,7 @@ /* No Symbian OS */ #define __has_symbianos__ 0 /* No OSF/1 */ -#define __has_ofs1__ 0 +#define __has_osf1__ 0 /* No Ultrix */ #define __has_ultrix__ 0 /* No UNICOS */ @@ -380,9 +380,9 @@ #define __has_symbianos__ 1 #endif #if defined(__osf__) || defined(__osf) -#undef __has_ofs1__ +#undef __has_osf1__ /* Has OSF/1 */ -#define __has_ofs1__ 1 +#define __has_osf1__ 1 #endif #if defined(ultrix) || defined(__ultrix) || defined(__ultrix__) || (defined(unix) && defined(vax)) #undef __has_ultrix__ From 45453c9af8cb7339d2740adfb0054dcb8a0a71b8 Mon Sep 17 00:00:00 2001 From: ChenPi11 Date: Sun, 12 Jan 2025 10:42:50 +0800 Subject: [PATCH 5/5] Rename macro `__has_mac_os__` to `__has_macos__` --- src/platforms.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/platforms.h b/src/platforms.h index 519ced5..eb9f53d 100644 --- a/src/platforms.h +++ b/src/platforms.h @@ -56,8 +56,8 @@ #define __has_linux__ 0 /* No LynxOS */ #define __has_lunx__ 0 -/* No MacOS */ -#define __has_mac_os__ 0 +/* No macOS */ +#define __has_macos__ 0 /* No Microware OS-9 */ #define __has_microware_os_9__ 0 /* No MINIX */ @@ -272,9 +272,9 @@ #define __has_lunx__ 1 #endif #if defined(macintosh) || defined(Macintosh) || defined(__APPLE__) || defined(__MACH__) -#undef __has_mac_os__ -/* Has MacOS */ -#define __has_mac_os__ 1 +#undef __has_macos__ +/* Has macOS */ +#define __has_macos__ 1 #endif #if defined(__OS9000) || defined(_OSK) #undef __has_microware_os_9__