git-svn-id: http://svn.code.sf.net/p/netboot65/code@132 93682198-c243-4bdb-bd91-e943c89aac3b

client/nb65/Makefile

@@ -9,6 +9,7 @@ INCFILES=\
   ../inc/net.i\
   ../inc/menu.i\
   ../inc/nb65_constants.i\
+  nb65_version.i\
 
 IP65LIB=../ip65/ip65.lib
 

client/nb65/nb65_c64.s

@@ -387,9 +387,6 @@ cmp #KEYCODE_F7
   ldax #tftp_dir_filemask
   stax nb65_param_buffer+NB65_TFTP_FILENAME
 
-  jsr print
-  jsr print_cr
-
   ldax  #nb65_param_buffer
   nb65call #NB65_TFTP_DOWNLOAD
   
@@ -530,8 +527,9 @@ cfg_get_configuration_ptr:
 	.rodata
 
 netboot65_msg: 
-.byte "NETBOOT65 - C64 NETWORK BOOT CLIENT V0.9",13
+.byte 13,"  NETBOOT65 - C64 CLIENT VERSION "
-.byte 0
+.include "nb65_version.i"
+.byte 13,0
 main_menu_msg:
 .byte 13,"             MAIN MENU",13,13
 .byte "F1: TFTP BOOT     F3: BASIC",13
@@ -548,7 +546,7 @@ config_menu_msg:
 
 downloading_msg:  .asciiz "DOWNLOADING "
 
-getting_dir_listing_msg: .asciiz "FETCHING DIR FOR "
+getting_dir_listing_msg: .byte "FETCHING DIRECTORY",13,0
 
 tftp_dir_listing_fail_msg:
 	.byte "DIR LISTING FAILED",13,0

client/nb65/nb65_version.i

@@ -0,0 +1 @@
+.byte "0.9.7"

client/nb65/utherboot.s

@@ -38,6 +38,10 @@
   .import __CODE_LOAD__
   .import __CODE_RUN__
   .import __CODE_SIZE__
+  .import __IP65_DEFAULTS_LOAD__
+  .import __IP65_DEFAULTS_RUN__
+  .import __IP65_DEFAULTS_SIZE__
+  
 
 ;.segment        "PAGE3"
 ;disable_language_card: .res 3
@@ -92,6 +96,9 @@ tftp_dir_buffer = $4000
   ldax #__RODATA_SIZE__
   jsr startup_copymem
 
+ 
+;@fixme:  jmp @fixme
+
   ;relocate the DATA segment
   ldax #__DATA_LOAD__
   stax copy_src
@@ -100,6 +107,14 @@ tftp_dir_buffer = $4000
   ldax #__DATA_SIZE__
   jsr startup_copymem
 
+ ;relocate the IP65_DEFAULTS segment
+  ldax #__IP65_DEFAULTS_LOAD__
+  stax copy_src
+  ldax #__IP65_DEFAULTS_RUN__
+  stax copy_dest  
+  ldax #__IP65_DEFAULTS_SIZE__
+  jsr startup_copymem
+ 
   jmp init
   
 ; copy memory
@@ -293,4 +308,6 @@ tftp_download_fail_msg:
 tftp_download_ok_msg:
 	.asciiz "DOWNLOAD OK"
 
-startup_msg: .byte "UTHERNET NETWORK BOOT CLIENT V0.1",0
+startup_msg: .byte "UTHERNET NETWORK BOOT CLIENT V"
+.include "nb65_version.i"
+.byte 0

dist/make_dist.rb

@@ -8,13 +8,17 @@ require 'ftools'
 
 WORKING_DIR=File.expand_path(File.dirname(__FILE__)+"/netboot65")
 SRC_DIR=File.expand_path(File.dirname(__FILE__)+"/../")
-["","a2","c64","lib","bin","boot","doc","inc","examples"].each do |dir_suffix|
+VERSION_FILE=File.expand_path(File.dirname(__FILE__)+"/version_number.txt")
+VERSION_INC_FILE=File.expand_path(File.dirname(__FILE__)+"/../client/nb65/nb65_version.i")
+version_string=File.open(VERSION_FILE).read
+
+["","c64","lib","bin","boot","doc","inc","examples"].each do |dir_suffix|
   dir_path="#{WORKING_DIR}/#{dir_suffix}"
   Dir.mkdir(dir_path) unless File.exist?(dir_path)
 end
 
 [
-["client/nb65/utherboot.dsk","a2/"],
+#["client/nb65/utherboot.dsk","a2/"],
 ["client/nb65/set_ip_config.rb","bin/"],
 #["client/nb65/nb65_rrnet.bin","c64/"],
 ["client/nb65/nb65_c64_ram.prg","c64/"],
@@ -22,12 +26,12 @@ end
 ["client/nb65/d64_upload.prg","boot/"],
 ["server/lib/tftp_server.rb","lib"],
 ["server/bin/tftp_only_server.rb","bin/tftp_server.rb"],
-["server/bin/import_ags_games.rb","bin"],
+#["server/bin/import_ags_games.rb","bin"],
-["server/boot/BOOTA2.PG2","boot"],
+#["server/boot/BOOTA2.PG2","boot"],
-["doc/README.Apple2.html","a2"],
+#["doc/README.Apple2.html","a2"],
 ["doc/README.C64.html","c64"],
 ["doc/netboot65.html","doc/index.html"],
-["doc/README.Apple2.html","doc"],
+#["doc/README.Apple2.html","doc"],
 ["doc/README.C64.html","doc"],
 ["doc/nb65_api_technical_reference.doc","doc"],
 ["client/inc/common.i","inc"],
@@ -45,5 +49,16 @@ end
 end
 
 
-zipfile_name=File.dirname(__FILE__)+"/netboot65-#{Time.now.strftime("%Y-%m-%d")}.zip"
+zipfile_name=File.dirname(__FILE__)+"/netboot65-#{version_string}.zip"
 Archive::Zip.archive(zipfile_name, WORKING_DIR)
+
+(maj,min,rel)=version_string.split(".")
+version_string="#{maj}.#{min}.#{(rel.to_i)+1}"
+
+file=File.new(VERSION_INC_FILE,"w")
+file<<".byte \"#{version_string}\"\n"
+file.close
+
+file=File.new(VERSION_FILE,"w")
+file<<version_string
+file.close