Changeset 1468

Timestamp:

Sep 21, 2009, 7:23:53 PM (16 years ago)

Author:

Steven Levine

Message:

Add some makefile notes
Avoid attempting to attach resources to fm3res.map
Correct some typos in file_id.diz and readme

Location:

trunk

Files:

• HISTORY (modified) (2 diffs)
• README (modified) (7 diffs)
• dll/makefile (modified) (4 diffs)
• makefile_post.mk (modified) (4 diffs)

trunk/HISTORY

@@ -7 +7 @@
  o Place drive letters over bitmaps replace, enlarge bitmaps in drive bar and add a refresh
  removable media and rescan button to the drive bar. Tickets 13, 91, 378, 385 (Gregg, David)
- o Added Option to list drive label or file system name along side of the drive letter 
- in the drive tree. Tickets 47 339 (Gregg)     
+ o Added Option to list drive label or file system name along side of the drive letter
+ in the drive tree. Tickets 47 339 (Gregg)
  o Modified the directory container "Scanning" message to "Please wait ...scanning...
  Ticket 291 (Steven)
  o Toggling between split and full status bars no longer opens a databar window. Ticket 364
  (Gregg)
- o Shortened the status line 1 message for split status lines; Conditionally added 
+ o Shortened the status line 1 message for split status lines; Conditionally added
  file system type to message. Ticket 365 (Gregg)
  o Added option to open user INI, System INI or fm/2's INI files to a submenu on
  the Utilities menu Ticket 366 (Gregg)
  o FM/2 can now load in high memory. We have shipped both high (3.17.1) and low (3.17.0)
- versions. Ticket 368, 388. 389, 401 (Gregg) 
- o Streamlined container scanning/loading Ticket 369, 370, 380, 381, 382 (Gregg, Steven) 
- o Fixed crashes caused by collecting files from list file and by pressing Ctrl-g 
+ versions. Ticket 368, 388. 389, 401 (Gregg)
+ o Streamlined container scanning/loading Ticket 369, 370, 380, 381, 382 (Gregg, Steven)
+ o Fixed crashes caused by collecting files from list file and by pressing Ctrl-g
  in the collector. Ticket 376, 395 (Gregg, Steven)
- o Allow .LONGNAME to be displayed for FAT & LAN drives and delete .LONGNAME EA 
+ o Allow .LONGNAME to be displayed for FAT & LAN drives and delete .LONGNAME EA
  if it becomes the filename on a copy or move. Ticket 377. 379, 386 (Gregg)
  o Setting to turn off state save now work Ticket 383 (Gregg)
@@ -31 +31 @@
  (Steven, David)
  o Fixed a hang that occurred on SMP systems. Ticket 394 (Steven, Gregg)
- o Fixed odd behavior when double clicking on the diretory container directory icon. 
+ o Fixed odd behavior when double clicking on the directory container directory icon.
  Ticket 398 (Gregg)
  o Provided the option to turn off the "drive exclude" suggestion dialog on start up.
  Ticket 399 (Gregg)
- o Suppressed error messages when scanning a directory containing a locked text file 
+ o Suppressed error messages when scanning a directory containing a locked text file
  or when Drag&Dropping more then one file from PMMail Ticket 391 400 (Gregg)
 

trunk/README

@@ -6 +6 @@
 
 FM/2 3.17: This release provides for loading FM/2 partially in high memory
-since this won't work on older systems (pre fixpack 13?) or you might have 
-other reasons not to use it we provide a low memory version also. Some high 
-loaded programs hang in the exit handler (ie don't close). We didn't 
-experience this problem but if you do install the low memory version (3.17.0). 
+since this won't work on older systems (pre fixpack 13?) or you might have
+other reasons not to use it we provide a low memory version also. Some high
+loaded programs hang in the exit handler (ie don't close). We didn't
+experience this problem but if you do install the low memory version (3.17.0).
 The high memory version is 3.17.1.
 
 This release makes changes that should speed the scanning and
 container filling in FM/2. We have added some visual clues to let you know
-FM/2 is still working. The LED in the lower right hand corner now blinks 
+FM/2 is still working. The LED in the lower right hand corner now blinks
 while long operations are in progress or you can open the thread note
-window (click on the LED) for even more detailed information about an 
-operation in progress. We also added a better "scanning" message. 
-
-We have updated the look and functionality of the drivebar. It now has the 
-drive letters superimposed over the drive icons allowing for larger icons. 
-We have add a refresh removable media and rescan button to the beginning 
-of the bar to make it a more complete replacement for the tree container 
-in FM/2 lite. You can also show the file system type or drive label next 
-to the drive letter in the tree container. See the Tree settings notbook 
-page to try this option. 
-
-The INI viewer option on the utilities menu now lets you choose to open 
-the user INI, system INI or FM2's INI. We now allow LONGNAMES to be 
-displayed for FAT & LAN drives and we  delete .LONGNAME EA if it becomes 
+window (click on the LED) for even more detailed information about an
+operation in progress. We also added a better "scanning" message.
+
+We have updated the look and functionality of the drivebar. It now has the
+drive letters superimposed over the drive icons allowing for larger icons.
+We have add a refresh removable media and rescan button to the beginning
+of the bar to make it a more complete replacement for the tree container
+in FM/2 lite. You can also show the file system type or drive label next
+to the drive letter in the tree container. See the Tree settings notebook
+page to try this option.
+
+The INI viewer option on the utilities menu now lets you choose to open
+the user INI, system INI or FM2's INI. We now allow LONGNAMES to be
+displayed for FAT & LAN drives and we  delete .LONGNAME EA if it becomes
 the filename on a copy or move. In addition to these we fixed 2 rare crashes
 and a hang associated with SMP. We also fixed a handful of interface problems.
 See the history file for more information.
 
-FM/2 3.16: This release makes changes that should allow FM/2 to be 
-translated into different languages. It also adds date and number 
-formatting based on the system locale settings. We now need to find 
-some individuals who are interested in doing the translations. 
+FM/2 3.16: This release makes changes that should allow FM/2 to be
+translated into different languages. It also adds date and number
+formatting based on the system locale settings. We now need to find
+some individuals who are interested in doing the translations.
 Currently, double bit character sets are not supported in FM/2.
 
@@ -43 +43 @@
 detection of text verses binary files when opening viewers and
 filtering/(de)select mask now works for archives with pathnames.
-We added the ability to turn error/alert beeps on and off in the 
+We added the ability to turn error/alert beeps on and off in the
 settings notebook (General page) and changes to the details switches
 in compare directories are now saved. See the history for more details.
@@ -142 +142 @@
 We also fixed some additional bugs and provide some performance
 enhancements. If you have had trouble with "broken pipe" errors
-copying to a netdrives samba drive let me know if it now works
+copying to a netdrive samba drive let me know if it now works
 better. I have built in some retries for this error but can't test
 it since I don't see the problem. Also please report back to us anytime
@@ -642 +642 @@
 
   http://groups.yahoo.com/group/fm2user/
-  
+
   This group is now closed but it still contains some useful information
-  
+
 There is a new mailing list at:
-  
+
   fm2-user@netlabs.org
-  
+
   To subscribe send an email to:
-  
+
   fm2-user-subscribe@netlabs.org
-  
+
   The subject and body can be empty.
-  
+
   This group is mirrored on Gmane at:
-  
+
   http://dir.gmane.org/gmane.org.netlabs.fm2.user
 
@@ -668 +668 @@
 
 To create a ticket reporting a defect or requesting an enhancement.
-You must be logged into TRAC. Please login with your Netlabs login id. 
-If you do not have a login id, you can request one at 
-http://www.netlabs.org/en/site/member/member.xml. 
-If you have troubles acquiring a Netlabs login id send an e-mail to 
+You must be logged into TRAC. Please login with your Netlabs login id.
+If you do not have a login id, you can request one at
+http://www.netlabs.org/en/site/member/member.xml.
+If you have troubles acquiring a Netlabs login id send an e-mail to
 Netlabs Community Mailing List <community@netlabs.org>.
 
@@ -681 +681 @@
   cd fm2_workspace
   svn checkout http://svn.netlabs.org/repos/fm2/trunk trunk
-  
-If you wish commit access please contact us directly.  
+
+If you wish commit access please contact us directly.
 
 You can reach us directly at:
@@ -695 +695 @@
 
 We also monitor the comp.os.os2.apps newsgroup, several
-others in the comp.os.os2.* hierarchy and other groups where 
-release announcements are made. 
+others in the comp.os.os2.* hierarchy and other groups where
+release announcements are made.
 
 Thanks and enjoy.

trunk/dll/makefile

@@ -6 +6 @@
 
 # 22 May 03 SHL Correct icon dependencies
-# 21 Nov 03 SHL Correct ipf dependents
-# 26 Jul 04 SHL Correct CFLAGSR
-# 23 May 05 SHL Drop saymsg
-# 24 May 05 SHL Add clean and cleanobj targets
-# 06 Jun 05 SHL Add warnings enable (WARN)
-# 24 Jul 05 SHL Rework resource kit support
-# 16 Apr 06 SHL Add lxlite target
-# 28 Jun 06 SHL Add more .h dependencies
-# 22 Jul 06 SHL Add more .h dependencies
-# 29 Jul 06 SHL Reorganize icons
-# 31 Jul 06 SHL Tweak dependencies
-# 16 Aug 06 SHL Drop 4os2-ism
-# 18 Aug 06 SHL Drop rc -x2 compression - not reliable
-# 01 Sep 06 SHL fm3.hlp: add missing dependency on ..\bitmaps
-# 01 Sep 06 SHL Adjust fm3str.str case
-# 30 Sep 06 GKY Add del of Help file to clean
-# 19 Oct 06 SHL Move all .hlp logic build to ipf\makefile too
 # 12 May 07 SHL Drop obsolete macros
 # 02 Jun 07 SHL Convert to OpenWatcom
@@ -52 +35 @@
 # 04 Feb 09 SHL Drop mkstr and fm3*.str now that we use STRINGTABLE
 # 12 Jul 09 GKY Allow FM/2 to load in high memory call exehdr /hi
+# 30 Jul 09 SHL Avoid attempting to attach resources to fm3res.map
 
 # Environment: see makefile_pre.mk
 
-# DEBUG - not defined = release build, defined = debug build
-# WARNALL - add more warnings if defined
-# FORTIFY - build with FORTIFYed memory
-# USE_RC - build with rc.exe if defined, other build with wrc.exe
-# HIMEM - build with changes to allow loading in high memory
+# DEBUG - debug build if defined, release build if not defined
+# WARNALL - add more warnings if defined, standard warnings if not defined
+# FORTIFY - enable FORTIFY heap checking if defined, omit FORITY support if not defined
+# USE_RC - use rc.exe if defined, use wrc.exe if not defined
+# HIMEM - load code and data in in high memory if defined, use low memory only if not defined
 
 BASE = fm3dll
@@ -269 +253 @@
   $(LINK) @$(BASERES).lrf @$(BASERES).def
   @echo.
-  @echo Compiling resource: $@
-  @echo.
-  $(RC) $(RCFLAGS2) $(BASERES).res $@
+  @echo Attaching resources to $(BASERES).dll
+  @echo.
+  $(RC) $(RCFLAGS2) $(BASERES).res $(BASERES).dll
 
 $(BASERES).lrf: $(__MAKEFILES__)
@@ -297 +281 @@
 !endif
   @echo.
-  @echo Compiling resource: $@
+  @echo Ataching resources to $@
   @echo.
   $(RC) $(RCFLAGS2) $(BASERES).res $@

trunk/makefile_post.mk

@@ -1 +1 @@
 # makefile_post.mk - common makefile suffix settings for all makefiles
 # $Id$
+
+# Copyright (c) 2002, 2009 Steven H. Levine
 
 # 16 Aug 05 SHL Clean up
@@ -10 +12 @@
 # 19 Nov 08 JBS Ticket 297: Removed bldlevel calls
 # 14 Dec 08 SHL Drop EXCEPTQ support - will not be used
+# 24 Jul 09 SHL Comments
 
 !ifndef MAKERES
@@ -21 +24 @@
   $(LINK) @$(BASE).lrf @$(BASE).def
   @echo.
-  @echo Compiling resource: $@
+  @echo Attaching resources to $@
   @echo.
   $(RC) $(RCFLAGS2) $(BASE).res $@
@@ -46 +49 @@
 !endif
   @echo.
-  @echo Compiling resource: $@
+  @echo Attaching resources to $@
   @echo.
   $(RC) $(RCFLAGS2) $(BASE).res $@