win9x -> win32

decompme · Feb 25, 2024 · 89b2b12 · 89b2b12
1 parent 7314f88
commit 89b2b12
Show file tree

Hide file tree

Showing 12 changed files with 64 additions and 64 deletions.
diff --git a/platforms/win9x/msvc4.0/Dockerfile → platforms/win32/msvc4.0/Dockerfile b/platforms/win9x/msvc4.0/Dockerfile → platforms/win32/msvc4.0/Dockerfile
@@ -8,14 +8,14 @@ FROM alpine:3.18 as base
 RUN wget -O 821e942fd95bd16d01649401de7943ef87ae9f54.zip "https://github.com/itsmattkc/MSVC400/archive/821e942fd95bd16d01649401de7943ef87ae9f54.zip"
 RUN unzip 821e942fd95bd16d01649401de7943ef87ae9f54.zip
 
-RUN mkdir -p /compilers/win9x/msvc4.0/Bin
-RUN mkdir -p /compilers/win9x/msvc4.0/Include
+RUN mkdir -p /compilers/win32/msvc4.0/Bin
+RUN mkdir -p /compilers/win32/msvc4.0/Include
 
-RUN cp -r MSVC400-*/BIN/*     /compilers/win9x/msvc4.0/Bin
-RUN cp -r MSVC400-*/INCLUDE/* /compilers/win9x/msvc4.0/Include
+RUN cp -r MSVC400-*/BIN/*     /compilers/win32/msvc4.0/Bin
+RUN cp -r MSVC400-*/INCLUDE/* /compilers/win32/msvc4.0/Include
 
-RUN chown -R root:root /compilers/win9x/msvc4.0/
-RUN chmod +x /compilers/win9x/msvc4.0/Bin/*
+RUN chown -R root:root /compilers/win32/msvc4.0/
+RUN chmod +x /compilers/win32/msvc4.0/Bin/*
 
 
 FROM scratch as release

diff --git a/platforms/win9x/msvc4.2/Dockerfile → platforms/win32/msvc4.2/Dockerfile b/platforms/win9x/msvc4.2/Dockerfile → platforms/win32/msvc4.2/Dockerfile
@@ -8,14 +8,14 @@ FROM alpine:3.18 as base
 RUN wget -O df2c13aad74c094988c6c7e784234c2e778a0e91.zip "https://github.com/itsmattkc/MSVC420/archive/df2c13aad74c094988c6c7e784234c2e778a0e91.zip"
 RUN unzip df2c13aad74c094988c6c7e784234c2e778a0e91.zip
 
-RUN mkdir -p /compilers/win9x/msvc4.2/Bin
-RUN mkdir -p /compilers/win9x/msvc4.2/Include
+RUN mkdir -p /compilers/win32/msvc4.2/Bin
+RUN mkdir -p /compilers/win32/msvc4.2/Include
 
-RUN cp -r MSVC420-*/bin/*     /compilers/win9x/msvc4.2/Bin
-RUN cp -r MSVC420-*/include/* /compilers/win9x/msvc4.2/Include
+RUN cp -r MSVC420-*/bin/*     /compilers/win32/msvc4.2/Bin
+RUN cp -r MSVC420-*/include/* /compilers/win32/msvc4.2/Include
 
-RUN chown -R root:root /compilers/win9x/msvc4.2/
-RUN chmod +x /compilers/win9x/msvc4.2/Bin/*
+RUN chown -R root:root /compilers/win32/msvc4.2/
+RUN chmod +x /compilers/win32/msvc4.2/Bin/*
 
 
 FROM scratch as release

diff --git a/platforms/win9x/msvc6.0/Dockerfile → platforms/win32/msvc6.0/Dockerfile b/platforms/win9x/msvc6.0/Dockerfile → platforms/win32/msvc6.0/Dockerfile
@@ -3,14 +3,14 @@
 
 FROM alpine:3.18 as base
 
-RUN mkdir -p /compilers/win9x/msvc6.0
+RUN mkdir -p /compilers/win32/msvc6.0
 
 RUN wget -O msvc6.0.tar.gz "https://github.com/OmniBlade/decomp.me/releases/download/msvcwin9x/msvc6.0.tar.gz"
-RUN tar xvzf msvc6.0.tar.gz -C /compilers/win9x/msvc6.0
-RUN rm -rf /compilers/win9x/msvc6.0/MFC
+RUN tar xvzf msvc6.0.tar.gz -C /compilers/win32/msvc6.0
+RUN rm -rf /compilers/win32/msvc6.0/MFC
 
-RUN chown -R root:root /compilers/win9x/msvc6.0/
-RUN chmod +x /compilers/win9x/msvc6.0/*
+RUN chown -R root:root /compilers/win32/msvc6.0/
+RUN chmod +x /compilers/win32/msvc6.0/*
 
 
 FROM scratch as release

diff --git a/platforms/win9x/msvc6.3/Dockerfile → platforms/win32/msvc6.3/Dockerfile b/platforms/win9x/msvc6.3/Dockerfile → platforms/win32/msvc6.3/Dockerfile
@@ -3,14 +3,14 @@
 
 FROM alpine:3.18 as base
 
-RUN mkdir -p /compilers/win9x/msvc6.3
+RUN mkdir -p /compilers/win32/msvc6.3
 
 RUN wget -O msvc6.3.tar.gz "https://github.com/OmniBlade/decomp.me/releases/download/msvcwin9x/msvc6.3.tar.gz"
-RUN tar xvzf msvc6.3.tar.gz -C /compilers/win9x/msvc6.3
-RUN rm -rf /compilers/win9x/msvc6.3/MFC
+RUN tar xvzf msvc6.3.tar.gz -C /compilers/win32/msvc6.3
+RUN rm -rf /compilers/win32/msvc6.3/MFC
 
-RUN chown -R root:root /compilers/win9x/msvc6.3/
-RUN chmod +x /compilers/win9x/msvc6.3/*
+RUN chown -R root:root /compilers/win32/msvc6.3/
+RUN chmod +x /compilers/win32/msvc6.3/*
 
 
 FROM scratch as release

diff --git a/platforms/win9x/msvc6.4/Dockerfile → platforms/win32/msvc6.4/Dockerfile b/platforms/win9x/msvc6.4/Dockerfile → platforms/win32/msvc6.4/Dockerfile
@@ -3,14 +3,14 @@
 
 FROM alpine:3.18 as base
 
-RUN mkdir -p /compilers/win9x/msvc6.4
+RUN mkdir -p /compilers/win32/msvc6.4
 
 RUN wget -O msvc6.4.tar.gz "https://github.com/OmniBlade/decomp.me/releases/download/msvcwin9x/msvc6.4.tar.gz"
-RUN tar xvzf msvc6.4.tar.gz -C /compilers/win9x/msvc6.4
-RUN rm -rf /compilers/win9x/msvc6.4/MFC
+RUN tar xvzf msvc6.4.tar.gz -C /compilers/win32/msvc6.4
+RUN rm -rf /compilers/win32/msvc6.4/MFC
 
-RUN chown -R root:root /compilers/win9x/msvc6.4/
-RUN chmod +x /compilers/win9x/msvc6.4/*
+RUN chown -R root:root /compilers/win32/msvc6.4/
+RUN chmod +x /compilers/win32/msvc6.4/*
 
 
 FROM scratch as release

diff --git a/platforms/win9x/msvc6.5/Dockerfile → platforms/win32/msvc6.5/Dockerfile b/platforms/win9x/msvc6.5/Dockerfile → platforms/win32/msvc6.5/Dockerfile
@@ -3,14 +3,14 @@
 
 FROM alpine:3.18 as base
 
-RUN mkdir -p /compilers/win9x/msvc6.5
+RUN mkdir -p /compilers/win32/msvc6.5
 
 RUN wget -O msvc6.5.tar.gz "https://github.com/OmniBlade/decomp.me/releases/download/msvcwin9x/msvc6.5.tar.gz"
-RUN tar xvzf msvc6.5.tar.gz -C /compilers/win9x/msvc6.5
-RUN rm -rf /compilers/win9x/msvc6.5/MFC
+RUN tar xvzf msvc6.5.tar.gz -C /compilers/win32/msvc6.5
+RUN rm -rf /compilers/win32/msvc6.5/MFC
 
-RUN chown -R root:root /compilers/win9x/msvc6.5/
-RUN chmod +x /compilers/win9x/msvc6.5/*
+RUN chown -R root:root /compilers/win32/msvc6.5/
+RUN chmod +x /compilers/win32/msvc6.5/*
 
 
 FROM scratch as release

diff --git a/platforms/win9x/msvc6.5pp/Dockerfile → platforms/win32/msvc6.5pp/Dockerfile b/platforms/win9x/msvc6.5pp/Dockerfile → platforms/win32/msvc6.5pp/Dockerfile
@@ -3,14 +3,14 @@
 
 FROM alpine:3.18 as base
 
-RUN mkdir -p /compilers/win9x/msvc6.5pp
+RUN mkdir -p /compilers/win32/msvc6.5pp
 
 RUN wget -O msvc6.5pp.tar.gz "https://github.com/OmniBlade/decomp.me/releases/download/msvcwin9x/msvc6.5pp.tar.gz"
-RUN tar xvzf msvc6.5pp.tar.gz -C /compilers/win9x/msvc6.5pp
-RUN rm -rf /compilers/win9x/msvc6.5pp/MFC
+RUN tar xvzf msvc6.5pp.tar.gz -C /compilers/win32/msvc6.5pp
+RUN rm -rf /compilers/win32/msvc6.5pp/MFC
 
-RUN chown -R root:root /compilers/win9x/msvc6.5pp/
-RUN chmod +x /compilers/win9x/msvc6.5pp/*
+RUN chown -R root:root /compilers/win32/msvc6.5pp/
+RUN chmod +x /compilers/win32/msvc6.5pp/*
 
 
 FROM scratch as release

diff --git a/platforms/win9x/msvc6.6/Dockerfile → platforms/win32/msvc6.6/Dockerfile b/platforms/win9x/msvc6.6/Dockerfile → platforms/win32/msvc6.6/Dockerfile
@@ -3,14 +3,14 @@
 
 FROM alpine:3.18 as base
 
-RUN mkdir -p /compilers/win9x/msvc6.6
+RUN mkdir -p /compilers/win32/msvc6.6
 
 RUN wget -O msvc6.6.tar.gz "https://github.com/OmniBlade/decomp.me/releases/download/msvcwin9x/msvc6.6.tar.gz"
-RUN tar xvzf msvc6.6.tar.gz -C /compilers/win9x/msvc6.6
-RUN rm -rf /compilers/win9x/msvc6.6/MFC
+RUN tar xvzf msvc6.6.tar.gz -C /compilers/win32/msvc6.6
+RUN rm -rf /compilers/win32/msvc6.6/MFC
 
-RUN chown -R root:root /compilers/win9x/msvc6.6/
-RUN chmod +x /compilers/win9x/msvc6.6/*
+RUN chown -R root:root /compilers/win32/msvc6.6/
+RUN chmod +x /compilers/win32/msvc6.6/*
 
 
 FROM scratch as release

diff --git a/platforms/win9x/msvc7.0/Dockerfile → platforms/win32/msvc7.0/Dockerfile b/platforms/win9x/msvc7.0/Dockerfile → platforms/win32/msvc7.0/Dockerfile
@@ -3,13 +3,13 @@
 
 FROM alpine:3.18 as base
 
-RUN mkdir -p /compilers/win9x/msvc7.0
+RUN mkdir -p /compilers/win32/msvc7.0
 
 RUN wget -O msvc7.0.tar.gz "https://github.com/roblabla/MSVC-7.0-Portable/releases/download/release/msvc7.0.tar.gz"
-RUN tar xvzf msvc7.0.tar.gz -C /compilers/win9x/msvc7.0
+RUN tar xvzf msvc7.0.tar.gz -C /compilers/win32/msvc7.0
 
-RUN chown -R root:root /compilers/win9x/msvc7.0/
-RUN chmod +x /compilers/win9x/msvc7.0/*
+RUN chown -R root:root /compilers/win32/msvc7.0/
+RUN chmod +x /compilers/win32/msvc7.0/*
 
 
 FROM scratch as release

diff --git a/platforms/win9x/msvc7.1/Dockerfile → platforms/win32/msvc7.1/Dockerfile b/platforms/win9x/msvc7.1/Dockerfile → platforms/win32/msvc7.1/Dockerfile
@@ -3,14 +3,14 @@
 
 FROM alpine:3.18 as base
 
-RUN mkdir -p /compilers/win9x/msvc7.1
+RUN mkdir -p /compilers/win32/msvc7.1
 
 RUN wget -O msvc7.0.tar.gz "https://github.com/OmniBlade/decomp.me/releases/download/msvcwin9x/msvc7.0.tar.gz"
-RUN tar xvzf msvc7.0.tar.gz -C /compilers/win9x/msvc7.1
-RUN rm -rf /compilers/win9x/msvc7.1/MFC
+RUN tar xvzf msvc7.0.tar.gz -C /compilers/win32/msvc7.1
+RUN rm -rf /compilers/win32/msvc7.1/MFC
 
-RUN chown -R root:root /compilers/win9x/msvc7.1/
-RUN chmod +x /compilers/win9x/msvc7.1/*
+RUN chown -R root:root /compilers/win32/msvc7.1/
+RUN chmod +x /compilers/win32/msvc7.1/*
 
 
 FROM scratch as release

diff --git a/templates/win9x/msvc.j2 → templates/win32/msvc.j2 b/templates/win9x/msvc.j2 → templates/win32/msvc.j2
diff --git a/values.yaml b/values.yaml
@@ -716,63 +716,63 @@ compilers:
     template: common/default
     file: https://github.com/OmniBlade/decomp.me/releases/download/wcc10.5/wcc11.0.tar.gz
 
-# WIN9X
+# WIN32
   - id: msvc6.0
-    platform: win9x
+    platform: win32
     template: common/default
     file: https://github.com/OmniBlade/decomp.me/releases/download/msvcwin9x/msvc6.0.tar.gz
     rm_dirs:
       - MFC
   - id: msvc6.3
-    platform: win9x
+    platform: win32
     template: common/default
     file: https://github.com/OmniBlade/decomp.me/releases/download/msvcwin9x/msvc6.3.tar.gz
     rm_dirs:
       - MFC
   - id: msvc6.4
-    platform: win9x
+    platform: win32
     template: common/default
     file: https://github.com/OmniBlade/decomp.me/releases/download/msvcwin9x/msvc6.4.tar.gz
     rm_dirs:
       - MFC
   - id: msvc6.5
-    platform: win9x
+    platform: win32
     template: common/default
     file: https://github.com/OmniBlade/decomp.me/releases/download/msvcwin9x/msvc6.5.tar.gz
     rm_dirs:
       - MFC
   - id: msvc6.5pp
-    platform: win9x
+    platform: win32
     template: common/default
     file: https://github.com/OmniBlade/decomp.me/releases/download/msvcwin9x/msvc6.5pp.tar.gz
     rm_dirs:
       - MFC
   - id: msvc6.6
-    platform: win9x
+    platform: win32
     template: common/default
     file: https://github.com/OmniBlade/decomp.me/releases/download/msvcwin9x/msvc6.6.tar.gz
     rm_dirs:
       - MFC
   - id: msvc7.0
-    platform: win9x
+    platform: win32
     template: common/default
     file: https://github.com/roblabla/MSVC-7.0-Portable/releases/download/release/msvc7.0.tar.gz
   - id: msvc7.1
-    platform: win9x
+    platform: win32
     template: common/default
     file: https://github.com/OmniBlade/decomp.me/releases/download/msvcwin9x/msvc7.0.tar.gz
     rm_dirs:
       - MFC
 
   - id: msvc4.0
-    platform: win9x
-    template: win9x/msvc
+    platform: win32
+    template: win32/msvc
     file: https://github.com/itsmattkc/MSVC400/archive/821e942fd95bd16d01649401de7943ef87ae9f54.zip
     bin_dir: MSVC400-*/BIN
     include_dir: MSVC400-*/INCLUDE
   - id: msvc4.2
-    platform: win9x
-    template: win9x/msvc
+    platform: win32
+    template: win32/msvc
     file: https://github.com/itsmattkc/MSVC420/archive/df2c13aad74c094988c6c7e784234c2e778a0e91.zip
     bin_dir: MSVC420-*/bin
     include_dir: MSVC420-*/include