Preparing for release

README.md

@@ -214,13 +214,14 @@ to contact me, send the `report.txt` along with the details on your issue.
 
 Internal release.
 
-### 1.1.4 (2024-04-26)
+### 1.1.4 (2024-05-02)
 
 * Fix bug in fdset macro where using D3 for a parameter could cause corruption.
 * Copy a null-terminated copy of IP address for `SocketIPAddressPortToSockaddr`.
 * Add test suite to exercise extension functionality.
 * Fix several crash bugs found due to the test suite.
 * Retructure API docs for easier reading.
+* Improve build and release tooling.
 
 ## Development
 

bin/release

@@ -6,14 +6,14 @@ require 'erb'
 
 source = File.read('src/BSDSocket.s')
 
-aminet_template = ERB.new(File.read("aminet.readme.erb"))
+aminet_template = ERB.new(File.read('aminet.readme.erb'))
 
 capture_version = false
 version = nil
 
 source.lines.each do |line|
   if capture_version
-    version = line[/dc\.b "([^"]+)"/,1]
+    version = line[/dc\.b "([^"]+)"/, 1]
 
     break
   end
@@ -34,37 +34,56 @@ FileUtils.rm_rf build_dir
 FileUtils.mkdir_p build_dir
 FileUtils.mkdir_p 'aminet'
 
+FileUtils.cp 'src/AMOSPro_BSDSocket.Lib', 'AMOSPro_BSDSocket.Lib'
+
 hackerbun_target = File.expand_path("dist/AMOSPro_BSDSocket_#{version}.lha")
 
 [
-  "AMOSPro_BSDSocket.Lib",
+  'AMOSPro_BSDSocket.Lib',
-  "README.md",
+  'README.md',
-  "API.md",
+  'API.md',
-  "LICENSE",
+  'LICENSE'
 ].each do |file|
   target = "#{build_dir}/#{file}"
   FileUtils.mkdir_p File.dirname(target)
   FileUtils.cp file, target
 end
 
-[
+%w[
-  "src",
+  src
-  "examples"
+  examples
 ].each do |dir|
   FileUtils.cp_r dir, "#{build_dir}/#{dir}"
 end
 
-Dir["icons/**/*.info"].each do |info|
+Dir['icons/**/*.info'].each do |info|
-  target = info.gsub("icons/", build_base + "/")
+  target = info.gsub('icons/', build_base + '/')
   FileUtils.mkdir_p File.dirname(target)
   FileUtils.cp info, target
 end
 
+Dir[File.join(build_base, '**', '*.uaem')].each do |file|
+  FileUtils.rm file
+end
+
+Dir[File.join(build_base, '**', '*.bak')].each do |file|
+  FileUtils.rm file
+end
+
+Dir[File.join(build_base, 'src', '*.Lib')].each do |file|
+  pp file
+  FileUtils.rm file
+end
+
+Dir[File.join(build_base, 'src', 'bsdsocket_l*')].each do |file|
+  FileUtils.rm file
+end
+
 Dir.chdir build_base do
   Open3.popen2e(
-    "jlha", "c", hackerbun_target,
+    'jlha', 'c', hackerbun_target,
-    *(Dir["*"])) do |stdin, stdout_and_stderr, wait_thr|
+    *(Dir['*'])
-
+  ) do |stdin, stdout_and_stderr, wait_thr|
     Thread.new do
       stdout_and_stderr.each { |l| puts l }
     end
@@ -75,7 +94,7 @@ Dir.chdir build_base do
   end
 end
 
-FileUtils.cp hackerbun_target, "aminet/BSDSocket-Extension.lha"
+FileUtils.cp hackerbun_target, 'aminet/BSDSocket-Extension.lha'
-File.open("aminet/BSDSocket-Extension.readme", "w") do |fh|
+File.open('aminet/BSDSocket-Extension.readme', 'w') do |fh|
   fh.puts aminet_template.result(binding)
 end

src/BSDSocket.s

@@ -2033,6 +2033,9 @@ _DnsGetHostAddressByName_GetIPAddressLength:
     ADDQ #2,D3
 
     Rjsr L_Demande ; string is in A0/A1
+    LEA 2(A0,D3.W),A1
+    MOVE.L A1,HiChaine(A5)
+    MOVE.L A0,A1
 
     MOVE.W D4,(A1)+
 
@@ -2042,11 +2045,6 @@ _DnsGetHostAddressByName_KeepCopying:
     MOVE.B (A2)+,(A1)+
     DBRA D4,_DnsGetHostAddressByName_KeepCopying
 
-    MOVE.W A1,D1
-    AND.W #$0001,D1
-    ADD.W D1,A1
-
-    MOVE.L A1,HiChaine(A5)
     MOVE.L A0,D3
 
     RestoreStackFunction

src/BSDSocket_Labels.s

@@ -1,5 +1,5 @@
 ; ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-; BSDSocket.s, list of the library functions on the 28-04-2024 19:05:54
+; BSDSocket.s, list of the library functions on the 02-05-2024 14:22:07
 ;
 ; ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 L_Cold:			set	0

src/BSDSocket_Size.s

@@ -1,5 +1,5 @@
 ; ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-; BSDSocket.s, library size on the 28-04-2024 19:05:54
+; BSDSocket.s, library size on the 02-05-2024 14:22:07
 ;
 ; ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Lib_Size		equ	 39