Re: [Firebird-devel] SF.net SVN: firebird:[54042]firebird/trunk/builds/posix

2012-02-26 Thread Alex Peshkoff 
 On 02/25/12 13:05, Paul Beach wrote:

 The commit now allows this work properly on the Mac.


Paul, do not worry too much. I hope my Friday commit solves a problem
using configure capabilities.
Certainly requires checking.


--
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
Firebird-Devel mailing list, web interface at 
https://lists.sourceforge.net/lists/listinfo/firebird-devel

Re: [Firebird-devel] SF.net SVN: firebird:[54042]firebird/trunk/builds/posix

2012-02-25 Thread Paul Beach 
Adriano,

It was me who added these sed usages to makefiles, to let build work 
after header files removal.

Some time later, I discovered gcc -MP:

-
This option instructs CPP to add a phony target for each dependency 
other than the main file, causing each to depend on nothing. These dummy 
rules work around errors make gives if you remove header files without 
updating the Makefile to match.
This is typical output:

   test.o: test.c test.h

   test.h:
-

AFAIR it does the needed thing. I'm just not sure since when this option 
is present.

Sed in itself is not a problem, unfortunately as Alex and I have just discovered
sed on linux v's sed on MacOSX are slightly different beasties.

Via Alex.

-i switch differs from GNU syntax

Mac:
-i extension
 Edit files in-place, saving backups with the specified
extension.  If a zero-length extension
 is given, no backup will be saved.  It is not recommended
to give a zero-length extension when
 in-place editing files, as you risk corruption or partial
content in situations where disk
 space is exhausted, etc.

GNU:
-i[extension]
  edit files in place (makes backup if extension supplied)

Currently we have the following command line:
sed -i -e command1 -e command2 somefile.d

Looks like Mac's sed does the follwoing:
- treats first -e switch as extension;
- treats command1 as single command (OK when missing -e switch on Mac)
- treats second -e switch as first file to be processed.

The commit now allows this work properly on the Mac.

Paul

--
Virtualization  Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing 
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
Firebird-Devel mailing list, web interface at 
https://lists.sourceforge.net/lists/listinfo/firebird-devel

Re: [Firebird-devel] SF.net SVN: firebird:[54042] firebird/trunk/builds/posix

2012-02-24 Thread Adriano dos Santos Fernandes 
It was me who added these sed usages to makefiles, to let build work 
after header files removal.

Some time later, I discovered gcc -MP:

-
This option instructs CPP to add a phony target for each dependency 
other than the main file, causing each to depend on nothing. These dummy 
rules work around errors make gives if you remove header files without 
updating the Makefile to match.
This is typical output:

   test.o: test.c test.h

   test.h:
-

AFAIR it does the needed thing. I'm just not sure since when this option 
is present.


Adriano


On 24/02/2012 14:55, alexpeshk...@users.sourceforge.net wrote:
 Revision: 54042
http://firebird.svn.sourceforge.net/firebird/?rev=54042view=rev
 Author:   alexpeshkoff
 Date: 2012-02-24 16:55:18 + (Fri, 24 Feb 2012)
 Log Message:
 ---
 Mac port

 Modified Paths:
 --
  firebird/trunk/builds/posix/darwin.defaults
  firebird/trunk/builds/posix/make.defaults
  firebird/trunk/builds/posix/make.rules

 Modified: firebird/trunk/builds/posix/darwin.defaults
 ===
 --- firebird/trunk/builds/posix/darwin.defaults   2012-02-24 12:39:27 UTC 
 (rev 54041)
 +++ firebird/trunk/builds/posix/darwin.defaults   2012-02-24 16:55:18 UTC 
 (rev 54042)
 @@ -63,3 +63,5 @@

   LINK_EMBED = $(LIB_LINK) $(LINK_FIREBIRD_EMBED_SYMBOLS) $(LIB_LINK_OPTIONS)\
$(LIB_EMBED_LINK_OPTIONS) $(LIB_LINK_SONAME)
 +
 +INLINE_EDIT_SED:= -i 

 Modified: firebird/trunk/builds/posix/make.defaults
 ===
 --- firebird/trunk/builds/posix/make.defaults 2012-02-24 12:39:27 UTC (rev 
 54041)
 +++ firebird/trunk/builds/posix/make.defaults 2012-02-24 16:55:18 UTC (rev 
 54042)
 @@ -131,6 +131,9 @@
   # multiple-precision integer library
   MATHLIB=@MATHLIB@

 +# switch to make sed edit files inplace
 +INLINE_EDIT_SED:= -i
 +
   # Default programs and tools to be used in the build process

   SH= sh -c

 Modified: firebird/trunk/builds/posix/make.rules
 ===
 --- firebird/trunk/builds/posix/make.rules2012-02-24 12:39:27 UTC (rev 
 54041)
 +++ firebird/trunk/builds/posix/make.rules2012-02-24 16:55:18 UTC (rev 
 54042)
 @@ -88,15 +88,15 @@

   $(OBJ)/%.o: $(SRC_ROOT)/%.c
   $(CC) $(WCFLAGS) -c $(firstword $) -o $@
 - @sed -i -e 1,2s/:/: \$$(wildcard/ -e \$$s/\(.*\)/\\1)/ $(patsubst 
 %.o,%.d,$@)
 + @sed $(INLINE_EDIT_SED) -e 1,2s/:/: \$$(wildcard/ -e 
 \$$s/\(.*\)/\\1)/ $(patsubst %.o,%.d,$@)

   $(OBJ)/%.o: $(OBJ)/%.cpp
   $(CXX) $(WCXXFLAGS) -c $(firstword $) -o $@
 - @sed -i -e 1,2s/:/: \$$(wildcard/ -e \$$s/\(.*\)/\\1)/ $(patsubst 
 %.o,%.d,$@)
 + @sed $(INLINE_EDIT_SED) -e 1,2s/:/: \$$(wildcard/ -e 
 \$$s/\(.*\)/\\1)/ $(patsubst %.o,%.d,$@)

   $(OBJ)/%.o: $(SRC_ROOT)/%.cpp
   $(CXX) $(WCXXFLAGS) -c $(firstword $) -o $@
 - @sed -i -e 1,2s/:/: \$$(wildcard/ -e \$$s/\(.*\)/\\1)/ $(patsubst 
 %.o,%.d,$@)
 + @sed $(INLINE_EDIT_SED) -e 1,2s/:/: \$$(wildcard/ -e 
 \$$s/\(.*\)/\\1)/ $(patsubst %.o,%.d,$@)

   .SUFFIXES: .epp .e


 This was sent by the SourceForge.net collaborative development platform, the 
 world's largest Open Source development site.


 --
 Virtualization  Cloud Management Using Capacity Planning
 Cloud computing makes use of virtualization - but cloud computing
 also focuses on allowing computing to be delivered as a service.
 http://www.accelacomm.com/jaw/sfnl/114/51521223/
 ___
 Firebird-checkins mailing list
 firebird-check...@lists.sourceforge.net
 https://lists.sourceforge.net/lists/listinfo/firebird-checkins


--
Virtualization  Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing 
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
Firebird-Devel mailing list, web interface at 
https://lists.sourceforge.net/lists/listinfo/firebird-devel