From 120ffb0b1fe6c5e3789dba425b801fd13fe31ec4 Mon Sep 17 00:00:00 2001 From: "Sergio R. Caprile" Date: Thu, 25 Apr 2024 14:33:58 -0300 Subject: [PATCH] move to new skeleton --- .github/workflows/nightly.yml | 4 ++-- .github/workflows/quicktest.yml | 4 ++-- examples/socks5-server/README.md | 1 - examples/socks5-server/mongoose.c | 1 - examples/socks5-server/mongoose.h | 1 - examples/tcp/README.md | 1 - examples/tcp/certs/ss_ca.pem | 1 - examples/tcp/certs/ss_client.pem | 1 - examples/tcp/certs/ss_server.pem | 1 - examples/tcp/mongoose.c | 1 - examples/tcp/mongoose.h | 1 - {examples => tutorials/tcp}/socks5-server/Makefile | 0 tutorials/tcp/socks5-server/README.md | 1 + {examples => tutorials/tcp}/socks5-server/main.c | 0 tutorials/tcp/socks5-server/mongoose.c | 1 + tutorials/tcp/socks5-server/mongoose.h | 1 + {examples => tutorials/tcp}/tcp/Makefile | 2 +- tutorials/tcp/tcp/README.md | 1 + tutorials/tcp/tcp/certs/ss_ca.pem | 1 + tutorials/tcp/tcp/certs/ss_client.pem | 1 + tutorials/tcp/tcp/certs/ss_server.pem | 1 + {examples => tutorials/tcp}/tcp/main.c | 0 tutorials/tcp/tcp/mongoose.c | 1 + tutorials/tcp/tcp/mongoose.h | 1 + 24 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 examples/socks5-server/README.md delete mode 120000 examples/socks5-server/mongoose.c delete mode 120000 examples/socks5-server/mongoose.h delete mode 100644 examples/tcp/README.md delete mode 120000 examples/tcp/certs/ss_ca.pem delete mode 120000 examples/tcp/certs/ss_client.pem delete mode 120000 examples/tcp/certs/ss_server.pem delete mode 120000 examples/tcp/mongoose.c delete mode 120000 examples/tcp/mongoose.h rename {examples => tutorials/tcp}/socks5-server/Makefile (100%) create mode 100644 tutorials/tcp/socks5-server/README.md rename {examples => tutorials/tcp}/socks5-server/main.c (100%) create mode 120000 tutorials/tcp/socks5-server/mongoose.c create mode 120000 tutorials/tcp/socks5-server/mongoose.h rename {examples => tutorials/tcp}/tcp/Makefile (97%) create mode 100644 tutorials/tcp/tcp/README.md create mode 120000 tutorials/tcp/tcp/certs/ss_ca.pem create mode 120000 tutorials/tcp/tcp/certs/ss_client.pem create mode 120000 tutorials/tcp/tcp/certs/ss_server.pem rename {examples => tutorials/tcp}/tcp/main.c (100%) create mode 120000 tutorials/tcp/tcp/mongoose.c create mode 120000 tutorials/tcp/tcp/mongoose.h diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index a0060c1e..3b10bdaa 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -210,10 +210,10 @@ jobs: # with: # platform: x64 - name: test they build - run: make -C test refprojs CFLAGS_EXTRA="${{ matrix.ssl }}" + run: make -C test refprojs_win CFLAGS_EXTRA="${{ matrix.ssl }}" shell: cmd - name: test they clean - run: make -C test clean_refprojs + run: make -C test clean_refprojs_win shell: cmd refprojs_mac: runs-on: macos-latest diff --git a/.github/workflows/quicktest.yml b/.github/workflows/quicktest.yml index 18bca05b..d10f2f21 100644 --- a/.github/workflows/quicktest.yml +++ b/.github/workflows/quicktest.yml @@ -132,10 +132,10 @@ jobs: # with: # platform: x64 - name: test they build - run: make -C test refprojs + run: make -C test refprojs_win shell: cmd - name: test they clean - run: make -C test clean_refprojs + run: make -C test clean_refprojs_win shell: cmd refprojs_mac: runs-on: macos-latest diff --git a/examples/socks5-server/README.md b/examples/socks5-server/README.md deleted file mode 100644 index 990c0427..00000000 --- a/examples/socks5-server/README.md +++ /dev/null @@ -1 +0,0 @@ -See detailed tutorial at https://mongoose.ws/tutorials/socks5-server/ diff --git a/examples/socks5-server/mongoose.c b/examples/socks5-server/mongoose.c deleted file mode 120000 index 8ef6e62d..00000000 --- a/examples/socks5-server/mongoose.c +++ /dev/null @@ -1 +0,0 @@ -../../mongoose.c \ No newline at end of file diff --git a/examples/socks5-server/mongoose.h b/examples/socks5-server/mongoose.h deleted file mode 120000 index 488ef358..00000000 --- a/examples/socks5-server/mongoose.h +++ /dev/null @@ -1 +0,0 @@ -../../mongoose.h \ No newline at end of file diff --git a/examples/tcp/README.md b/examples/tcp/README.md deleted file mode 100644 index 8107b4d0..00000000 --- a/examples/tcp/README.md +++ /dev/null @@ -1 +0,0 @@ -See detailed tutorial at https://mongoose.ws/tutorials/tcp/ diff --git a/examples/tcp/certs/ss_ca.pem b/examples/tcp/certs/ss_ca.pem deleted file mode 120000 index 74fb0c3b..00000000 --- a/examples/tcp/certs/ss_ca.pem +++ /dev/null @@ -1 +0,0 @@ -../../../test/data/ss_ca.pem \ No newline at end of file diff --git a/examples/tcp/certs/ss_client.pem b/examples/tcp/certs/ss_client.pem deleted file mode 120000 index 2514cfac..00000000 --- a/examples/tcp/certs/ss_client.pem +++ /dev/null @@ -1 +0,0 @@ -../../../test/data/ss_client.pem \ No newline at end of file diff --git a/examples/tcp/certs/ss_server.pem b/examples/tcp/certs/ss_server.pem deleted file mode 120000 index 50f966dd..00000000 --- a/examples/tcp/certs/ss_server.pem +++ /dev/null @@ -1 +0,0 @@ -../../../test/data/ss_server.pem \ No newline at end of file diff --git a/examples/tcp/mongoose.c b/examples/tcp/mongoose.c deleted file mode 120000 index 8ef6e62d..00000000 --- a/examples/tcp/mongoose.c +++ /dev/null @@ -1 +0,0 @@ -../../mongoose.c \ No newline at end of file diff --git a/examples/tcp/mongoose.h b/examples/tcp/mongoose.h deleted file mode 120000 index 488ef358..00000000 --- a/examples/tcp/mongoose.h +++ /dev/null @@ -1 +0,0 @@ -../../mongoose.h \ No newline at end of file diff --git a/examples/socks5-server/Makefile b/tutorials/tcp/socks5-server/Makefile similarity index 100% rename from examples/socks5-server/Makefile rename to tutorials/tcp/socks5-server/Makefile diff --git a/tutorials/tcp/socks5-server/README.md b/tutorials/tcp/socks5-server/README.md new file mode 100644 index 00000000..ee1a0cd9 --- /dev/null +++ b/tutorials/tcp/socks5-server/README.md @@ -0,0 +1 @@ +See detailed tutorial at https://mongoose.ws/tutorials/tcp/socks5-server/ diff --git a/examples/socks5-server/main.c b/tutorials/tcp/socks5-server/main.c similarity index 100% rename from examples/socks5-server/main.c rename to tutorials/tcp/socks5-server/main.c diff --git a/tutorials/tcp/socks5-server/mongoose.c b/tutorials/tcp/socks5-server/mongoose.c new file mode 120000 index 00000000..5e522bbc --- /dev/null +++ b/tutorials/tcp/socks5-server/mongoose.c @@ -0,0 +1 @@ +../../../mongoose.c \ No newline at end of file diff --git a/tutorials/tcp/socks5-server/mongoose.h b/tutorials/tcp/socks5-server/mongoose.h new file mode 120000 index 00000000..ee4ac823 --- /dev/null +++ b/tutorials/tcp/socks5-server/mongoose.h @@ -0,0 +1 @@ +../../../mongoose.h \ No newline at end of file diff --git a/examples/tcp/Makefile b/tutorials/tcp/tcp/Makefile similarity index 97% rename from examples/tcp/Makefile rename to tutorials/tcp/tcp/Makefile index a70bff49..c9c4e1b2 100644 --- a/examples/tcp/Makefile +++ b/tutorials/tcp/tcp/Makefile @@ -29,7 +29,7 @@ clean: # Cleanup. Delete built program and all build artifact # Generate packed filesystem for serving credentials packed_fs.c: $(wildcard certs/*) Makefile - $(CC) ../../test/pack.c -o $(PACK) + $(CC) ../../../test/pack.c -o $(PACK) $(PACK) $(wildcard certs/*) > $@ # see https://mongoose.ws/tutorials/tls/#how-to-build for TLS build options diff --git a/tutorials/tcp/tcp/README.md b/tutorials/tcp/tcp/README.md new file mode 100644 index 00000000..374c233d --- /dev/null +++ b/tutorials/tcp/tcp/README.md @@ -0,0 +1 @@ +See detailed tutorial at https://mongoose.ws/tutorials/tcp/tcp/ diff --git a/tutorials/tcp/tcp/certs/ss_ca.pem b/tutorials/tcp/tcp/certs/ss_ca.pem new file mode 120000 index 00000000..5ea4d491 --- /dev/null +++ b/tutorials/tcp/tcp/certs/ss_ca.pem @@ -0,0 +1 @@ +../../../../test/data/ss_ca.pem \ No newline at end of file diff --git a/tutorials/tcp/tcp/certs/ss_client.pem b/tutorials/tcp/tcp/certs/ss_client.pem new file mode 120000 index 00000000..813dbf91 --- /dev/null +++ b/tutorials/tcp/tcp/certs/ss_client.pem @@ -0,0 +1 @@ +../../../../test/data/ss_client.pem \ No newline at end of file diff --git a/tutorials/tcp/tcp/certs/ss_server.pem b/tutorials/tcp/tcp/certs/ss_server.pem new file mode 120000 index 00000000..30eb6889 --- /dev/null +++ b/tutorials/tcp/tcp/certs/ss_server.pem @@ -0,0 +1 @@ +../../../../test/data/ss_server.pem \ No newline at end of file diff --git a/examples/tcp/main.c b/tutorials/tcp/tcp/main.c similarity index 100% rename from examples/tcp/main.c rename to tutorials/tcp/tcp/main.c diff --git a/tutorials/tcp/tcp/mongoose.c b/tutorials/tcp/tcp/mongoose.c new file mode 120000 index 00000000..5e522bbc --- /dev/null +++ b/tutorials/tcp/tcp/mongoose.c @@ -0,0 +1 @@ +../../../mongoose.c \ No newline at end of file diff --git a/tutorials/tcp/tcp/mongoose.h b/tutorials/tcp/tcp/mongoose.h new file mode 120000 index 00000000..ee4ac823 --- /dev/null +++ b/tutorials/tcp/tcp/mongoose.h @@ -0,0 +1 @@ +../../../mongoose.h \ No newline at end of file