build for 1.2mb floppy too

git-svn-id: file:///raid/svn-main/nishi-dataworks/trunk@335 d4a5a174-5a4a-5b4b-b672-37683c10d7d5

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1f2ce323afc6662fbe3417ba2f68f2e6a9ffe8ec..39c2b4beae770a71d76254510ceb1316812f7b20 100644 (file)
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -173,12 +173,23 @@ jobs:
     - name: Add INCLUDE env
       run: echo "INCLUDE=/usr/watcom/h" >> $GITHUB_ENV
     - name: Make
-      run: xvfb-run make YACC=byacc dos-installer
+      run: xvfb-run make YACC=byacc dos-installer FLOPPY_SIZE=1440
+    - name: Rename
+      run: mv install.img install1440.img
+    - name: Make
+      run: xvfb-run make YACC=byacc dos-installer FLOPPY_SIZE=1200
+    - name: Rename
+      run: mv install.img install1200.img
+    - name: Upload artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: build-dosimg1200
+        path: install1200.img
     - name: Upload artifact
       uses: actions/upload-artifact@v4
       with:
-        name: build-dosimg
-        path: install.img
+        name: build-dosimg1440
+        path: install1440.img
 
   test:
 
@@ -223,10 +234,14 @@ jobs:
       uses: actions/download-artifact@v4
       with:
         name: build-debpkg
-    - name: Download from build-dosimg
+    - name: Download from build-dosimg1200
+      uses: actions/download-artifact@v4
+      with:
+        name: build-dosimg1200
+    - name: Download from build-dosimg1440
       uses: actions/download-artifact@v4
       with:
-        name: build-dosimg
+        name: build-dosimg1440
     - name: Extract the build-generic
       run: unzip $GITHUB_WORKSPACE/build-generic.zip
     - name: Extract the build-macos
@@ -238,6 +253,6 @@ jobs:
       env:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     - name: Release
-      run: gh release create -t "v$(make get-version)" "$(make get-version)" dataworks-linux64.{tar.gz,zip} dataworks-win32.{tar.gz,zip} dataworks-dos4g.{tar.gz,zip} dataworks-dos.{tar.gz,zip} dataworks-win64.{tar.gz,zip} dataworks-macos-arm64.{tar.gz,zip} dataworks-server-win32.exe dataworks-server-win64.exe dataworks-server-dos.exe dataworks-server-dos4g.exe dataworks-win32.exe dataworks-win64.exe dataworks-dos.exe dataworks-dos4g.exe dataworks-linux64 dataworks-server-linux64 dataworks-macos-arm64 dataworks-server-macos-arm64 install.img dataworks-amd64-ubuntu.deb -n "Version \`$(make get-version)\` was built in this release"
+      run: gh release create -t "v$(make get-version)" "$(make get-version)" dataworks-linux64.{tar.gz,zip} dataworks-win32.{tar.gz,zip} dataworks-dos4g.{tar.gz,zip} dataworks-dos.{tar.gz,zip} dataworks-win64.{tar.gz,zip} dataworks-macos-arm64.{tar.gz,zip} dataworks-server-win32.exe dataworks-server-win64.exe dataworks-server-dos.exe dataworks-server-dos4g.exe dataworks-win32.exe dataworks-win64.exe dataworks-dos.exe dataworks-dos4g.exe dataworks-linux64 dataworks-server-linux64 dataworks-macos-arm64 dataworks-server-macos-arm64 install1200.img install1440.img dataworks-amd64-ubuntu.deb -n "Version \`$(make get-version)\` was built in this release"
       env:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/Makefiles/common.mk b/Makefiles/common.mk
index 11a67f6e22afc6665491be4f4c9134d7eef7ea82..a8ce9b01cda0475b213f7505b9d8f61bd9e3a8a9 100644 (file)
--- a/Makefiles/common.mk
+++ b/Makefiles/common.mk
@@ -67,7 +67,7 @@ dos-installer:
        if [ ! "$(FORMAT)" = "NO" ]; then $(MAKE) PLATFORM=dos clean ; fi
        if [ ! "$(FORMAT)" = "NO" ]; then $(MAKE) PLATFORM=dos no-doc ; fi
        if [ ! "$(FORMAT)" = "NO" ]; then rm -f install.img ; fi
-       if [ ! "$(FORMAT)" = "NO" ]; then mformat -C -f 1440 -v DWINST -i install.img :: ; fi
+       if [ ! "$(FORMAT)" = "NO" ]; then mformat -C -f $(FLOPPY_SIZE) -v DWINST -i install.img :: ; fi
        if [ ! "$(FORMAT)" = "NO" ]; then mcopy -i install.img Client/*.exe ::dw.exe ; fi
        if [ ! "$(FORMAT)" = "NO" ]; then mcopy -i install.img Server/*.exe ::dwserv.exe ; fi
        if [ ! "$(FORMAT)" = "NO" ]; then mcopy -i install.img RemoteClient/*.exe ::dwrcli.exe ; fi