update scripts

build-scripts/macosx/make-macosx-build.sh

@@ -24,9 +24,11 @@ git reset --hard
 git pull
 git clean -dfx
 git reset --hard
-./build-macosx || exit 1
+./build-macos || exit 1
 make dosbox-x.app || exit 1
 cp CHANGELOG CHANGELOG.txt || exit 1
+cp COPYING COPYING.txt || exit 1
+cp contrib/macos/readme.txt README.txt || exit 1
 
 cd "$top/dosbox-x-sdl2" || exit 1
 git clean -dfx
@@ -37,14 +39,16 @@ git reset --hard
 git pull
 git clean -dfx
 git reset --hard
-./build-macosx-sdl2 || exit 1
+./build-macos-sdl2 || exit 1
 make dosbox-x.app || exit 1
 cp CHANGELOG CHANGELOG.txt || exit 1
+cp COPYING COPYING.txt || exit 1
+cp contrib/macos/readme.txt README.txt || exit 1
 
 cd "$top" || exit 1
 echo "Packing up now..."
 
-zip -r -9 "$name" dosbox-x/dosbox-x.app dosbox-x/CHANGELOG.txt dosbox-x-sdl2/dosbox-x.app dosbox-x-sdl2/CHANGELOG.txt || exit 1
+zip -r -9 "$name" dosbox-x/dosbox-x.app dosbox-x/CHANGELOG.txt dosbox-x/COPYING.txt dosbox-x/README.txt dosbox-x-sdl2/dosbox-x.app dosbox-x-sdl2/CHANGELOG.txt dosbox-x-sdl2/COPYING.txt dosbox-x-sdl2/README.txt || exit 1
 
 exit 0
 

build-scripts/mingw/make-mingw-hx-dos.sh

@@ -57,13 +57,14 @@ git reset --hard
 
 # The paths of copied files and HX DOS Extender files 
 copydir="build-scripts/mingw/dosbox-x-mingw-hx-dos"
-hxdir="build-scripts/mingw/hxdos"
+hxdir="build-scripts/mingw/hxdos-bin"
 
 strip src/dosbox-x.exe || exit 1
 cp src/dosbox-x.exe dosbox-x.exe || exit 1
 $hxdir/pestub.exe -n dosbox-x.exe
 $tooldir/upx.exe --lzma -9 dosbox-x.exe
 cp CHANGELOG CHANGELOG.txt || exit 1
+cp COPYING COPYING.txt || exit 1
 cp dosbox-x.reference.conf dosbox-x.ref || exit 1
 cp dosbox-x.reference.full.conf dosbox-x.ref.full || exit 1
 cp contrib/windows/installer/inpout32.dll INPOUT32.DLL || exit 1
@@ -84,7 +85,7 @@ for i in `ls contrib/translations/` ; do cp contrib/translations/$i/*.lng langua
 cd "$top/$hxdosdir" || exit 1
 echo "Packing up now..."
 
-$tooldir/zip.exe -r -9 ../"$name" {CHANGELOG.txt,dosbox-x.exe,dosbox-x.ref,dosbox-x.ref.full,FREECG98.BMP,wqy_12pt.bdf,Nouveau_IBM.ttf,DPMILD32.EXE,HDPMI32.EXE,HXGUIHLP.INI,README.TXT,WINSPOOL.DRV,*.DLL,drivez/*,language/*} || exit 1
+$tooldir/zip.exe -r -9 ../"$name" {CHANGELOG.txt,COPYING.txt,dosbox-x.exe,dosbox-x.ref,dosbox-x.ref.full,FREECG98.BMP,wqy_1?pt.bdf,Nouveau_IBM.ttf,DPMILD32.EXE,HDPMI32.EXE,HXGUIHLP.INI,README.TXT,WINSPOOL.DRV,*.DLL,drivez/*,language/*} || exit 1
 cd ..
 
 exit 0

build-scripts/mingw/make-mingw.sh

@@ -36,9 +36,14 @@ mkdir -p "$build" || exit 1
 ziptool="$top/dosbox-x-mingw/vs/tool/zip.exe"
 
 # do it
-for what in mingw mingw-lowend mingw-sdl2 mingw-sdldraw; do
+for what in mingw mingw-sdl2 mingw-lowend mingw-lowend-sdl2; do
 buildtarget="$build/$what"
 mkdir -p "$buildtarget" || exit 1
+mkdir -p "$buildtarget/drivez" || exit 1
+mkdir -p "$buildtarget/scripts" || exit 1
+mkdir -p "$buildtarget/shaders" || exit 1
+mkdir -p "$buildtarget/glshaders" || exit 1
+mkdir -p "$buildtarget/languages" || exit 1
 cd "$top/dosbox-x-mingw" || exit 1
 git clean -dfx
 git reset --hard
@@ -54,6 +59,21 @@ cp src/dosbox-x.exe "$buildtarget/dosbox-x.exe" || exit 1
 cp CHANGELOG "$buildtarget/CHANGELOG.txt" || exit 1
 cp dosbox-x.reference.conf "$buildtarget/dosbox-x.reference.conf" || exit 1
 cp dosbox-x.reference.full.conf "$buildtarget/dosbox-x.reference.full.conf" || exit 1
+if [[ "$MSYSTEM" == "MINGW32" ]]; then
+    cp contrib/windows/installer/inpout32.dll "$buildtarget/inpout32.dll" || exit 1
+else
+    cp contrib/windows/installer/inpoutx64.dll "$buildtarget/inpoutx64.dll" || exit 1
+fi
+cp contrib/fonts/FREECG98.BMP "$buildtarget/FREECG98.BMP" || exit 1
+cp contrib/fonts/wqy_1?pt.bdf "$buildtarget/" || exit 1
+cp contrib/fonts/Nouveau_IBM.ttf "$buildtarget/Nouveau_IBM.ttf" || exit 1
+cp contrib/fonts/SarasaGothicFixed.ttf "$buildtarget/SarasaGothicFixed.ttf" || exit 1
+cp contrib/windows/installer/drivez_readme.txt "$buildtarget/drivez/readme.txt" || exit 1
+cp contrib/windows/installer/windows_explorer_context_menu*.bat "$buildtarget/scripts/" || exit 1
+cp contrib/windows/shaders/* "$buildtarget/shaders/" || exit 1
+cp contrib/glshaders/* "$buildtarget/glshaders/" || exit 1
+cp contrib/translations/*/*.lng "$buildtarget/languages/" || exit 1
+
 done
 
 cd "$top" || exit 1