WaveSwissKnife 0.0.1.20101110-x86-cygwin → 0.1.0.20110830-x86-cygwin

data/ChangeLog

@@ -1,5 +1,15 @@
 = WaveSwissKnife Release History
 
+== 0.1.0.20110830 (Beta)
+
+* Migrated repository to git.
+* Updated copyright information
+* Made regression 100% successful.
+* Migrated TODO list to Trackers.
+* Made building extensions report errors correctly.
+* Bug correction: Reading FFT samples could not be performed.
+
 == 0.0.1.20101110 (Alpha)
 
 * Initial public release.
+

data/LICENSE

@@ -6,7 +6,7 @@ This list is found in the file named AUTHORS.
 The AUTHORS and LICENSE files have to be included in any release of software
 embedding source code of this package, or using it as a derivative software.
 
-Copyright (c) 2010 Muriel Salvan (murielsalvan@users.sourceforge.net)
+Copyright (c) 2010 - 2011 Muriel Salvan (murielsalvan@users.sourceforge.net)
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

data/ReleaseInfo

@@ -2,7 +2,7 @@
 # This file has been generated by RubyPackager during a delivery.
 # More info about RubyPackager: http://rubypackager.sourceforge.net
 {
-  :Version => '0.0.1.20101110',
-  :Tags => [ 'Alpha' ],
-  :DevStatus => 'Alpha'
+  :Version => '0.1.0.20110830',
+  :Tags => [ 'Beta' ],
+  :DevStatus => 'Beta'
 }

data/bin/WSK.rb

@@ -1,6 +1,6 @@
 #!env ruby
 #--
-# Copyright (c) 2009-2010 Muriel Salvan (murielsalvan@users.sourceforge.net)
+# Copyright (c) 2009 - 2011 Muriel Salvan (murielsalvan@users.sourceforge.net)
 # Licensed under the terms specified in LICENSE file. No warranty is provided.
 #++
 

data/ext/WSK/AnalyzeUtils/AnalyzeUtils.c

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2009-2010 Muriel Salvan (murielsalvan@users.sourceforge.net)
+ * Copyright (c) 2009 - 2011 Muriel Salvan (murielsalvan@users.sourceforge.net)
  * Licensed under the terms specified in LICENSE file. No warranty is provided.
  **/
 

data/ext/WSK/AnalyzeUtils/Makefile

@@ -7,32 +7,35 @@ srcdir = .
 topdir = /usr/lib/ruby/1.8/i386-cygwin
 hdrdir = $(topdir)
 VPATH = $(srcdir):$(topdir):$(hdrdir)
-prefix = $(DESTDIR)/usr
 exec_prefix = $(prefix)
-sitedir = $(prefix)/lib/ruby/site_ruby
-rubylibdir = $(libdir)/ruby/$(ruby_version)
-docdir = $(datarootdir)/doc/$(PACKAGE)
-dvidir = $(docdir)
-datarootdir = $(prefix)/share
-archdir = $(rubylibdir)/$(arch)
-sbindir = $(exec_prefix)/sbin
+prefix = $(DESTDIR)/usr
+sharedstatedir = $(prefix)/com
+mandir = $(prefix)/share/man
 psdir = $(docdir)
+oldincludedir = $(DESTDIR)/usr/include
 localedir = $(datarootdir)/locale
+bindir = $(exec_prefix)/bin
+libexecdir = $(prefix)/sbin
+sitedir = $(libdir)/ruby/site_ruby
 htmldir = $(docdir)
-datadir = $(prefix)/share
+vendorarchdir = $(vendorlibdir)/$(sitearch)
 includedir = $(prefix)/include
 infodir = $(prefix)/share/info
+vendorlibdir = $(vendordir)/$(ruby_version)
 sysconfdir = $(DESTDIR)/etc
-mandir = $(prefix)/share/man
 libdir = $(exec_prefix)/lib
-sharedstatedir = $(prefix)/com
-oldincludedir = $(DESTDIR)/usr/include
+sbindir = $(exec_prefix)/sbin
+rubylibdir = $(libdir)/ruby/$(ruby_version)
+docdir = $(datarootdir)/doc/$(PACKAGE)
+dvidir = $(docdir)
+vendordir = $(libdir)/ruby/vendor_ruby
+datarootdir = $(prefix)/share
 pdfdir = $(docdir)
+archdir = $(rubylibdir)/$(arch)
 sitearchdir = $(sitelibdir)/$(sitearch)
-bindir = $(exec_prefix)/bin
+datadir = $(prefix)/share
 localstatedir = $(DESTDIR)/var
 sitelibdir = $(sitedir)/$(ruby_version)
-libexecdir = $(prefix)/sbin
 
 CC = gcc
 LIBRUBY = lib$(RUBY_SO_NAME).dll.a
@@ -41,11 +44,15 @@ LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
 LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
 
 RUBY_EXTCONF_H = 
-CFLAGS   =  -g -O2  -Wall  -I/cygdrive/f/RR/Source/waveswissknife/svn/waveswissknife/external/CommonUtils/include  
+CFLAGS   =  -g -O2  $(cflags) -Wall  -I/cygdrive/c/Env/Source/waveswissknife/git/waveswissknife/external/CommonUtils/include  
 INCFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir)
-CPPFLAGS =  
+DEFS     = 
+CPPFLAGS =   $(DEFS) $(cppflags)
 CXXFLAGS = $(CFLAGS) 
-DLDFLAGS = -L.  -L/cygdrive/f/RR/Source/waveswissknife/svn/waveswissknife/external/CommonUtils/lib -lCommonUtils   -Wl,--enable-auto-image-base,--enable-auto-import,--export-all 
+ldflags  = -L.  -L/cygdrive/c/Env/Source/waveswissknife/git/waveswissknife/external/CommonUtils/lib -lCommonUtils 
+dldflags =  -Wl,--enable-auto-image-base,--enable-auto-import,--export-all
+archflag = 
+DLDFLAGS = $(ldflags) $(dldflags) $(archflag)
 LDSHARED = gcc -shared -s
 AR = ar
 EXEEXT = .exe
@@ -69,7 +76,7 @@ COPY = cp
 preload = 
 
 libpath = . $(libdir)
-LIBPATH =  -L"." -L"$(libdir)"
+LIBPATH =  -L. -L$(libdir)
 DEFFILE = 
 
 CLEANFILES = mkmf.log
@@ -87,6 +94,7 @@ DLLIB = $(TARGET).so
 EXTSTATIC = 
 STATIC_LIB = 
 
+BINDIR        = $(bindir)
 RUBYCOMMONDIR = $(sitedir)$(target_prefix)
 RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
 RUBYARCHDIR   = $(sitearchdir)$(target_prefix)

data/ext/WSK/AnalyzeUtils/build.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2009-2010 Muriel Salvan (murielsalvan@users.sourceforge.net)
+# Copyright (c) 2009 - 2011 Muriel Salvan (murielsalvan@users.sourceforge.net)
 # Licensed under the terms specified in LICENSE file. No warranty is provided.
 #++
 
@@ -15,4 +15,6 @@ lAdditionalLocalLibs.each do |iLibName|
   $LDFLAGS += " -L#{lLibDir}/lib -l#{iLibName} "
 end
 create_makefile('AnalyzeUtils')
-system('make')
+if (!system('make'))
+  raise RuntimeError.new("Error while running 'make': #{$?}")
+end

data/ext/WSK/ArithmUtils/ArithmUtils.c

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2009-2010 Muriel Salvan (murielsalvan@users.sourceforge.net)
+ * Copyright (c) 2009 - 2011 Muriel Salvan (murielsalvan@users.sourceforge.net)
  * Licensed under the terms specified in LICENSE file. No warranty is provided.
  **/
 

data/ext/WSK/ArithmUtils/Makefile

@@ -7,32 +7,35 @@ srcdir = .
 topdir = /usr/lib/ruby/1.8/i386-cygwin
 hdrdir = $(topdir)
 VPATH = $(srcdir):$(topdir):$(hdrdir)
-prefix = $(DESTDIR)/usr
 exec_prefix = $(prefix)
-sitedir = $(prefix)/lib/ruby/site_ruby
-rubylibdir = $(libdir)/ruby/$(ruby_version)
-docdir = $(datarootdir)/doc/$(PACKAGE)
-dvidir = $(docdir)
-datarootdir = $(prefix)/share
-archdir = $(rubylibdir)/$(arch)
-sbindir = $(exec_prefix)/sbin
+prefix = $(DESTDIR)/usr
+sharedstatedir = $(prefix)/com
+mandir = $(prefix)/share/man
 psdir = $(docdir)
+oldincludedir = $(DESTDIR)/usr/include
 localedir = $(datarootdir)/locale
+bindir = $(exec_prefix)/bin
+libexecdir = $(prefix)/sbin
+sitedir = $(libdir)/ruby/site_ruby
 htmldir = $(docdir)
-datadir = $(prefix)/share
+vendorarchdir = $(vendorlibdir)/$(sitearch)
 includedir = $(prefix)/include
 infodir = $(prefix)/share/info
+vendorlibdir = $(vendordir)/$(ruby_version)
 sysconfdir = $(DESTDIR)/etc
-mandir = $(prefix)/share/man
 libdir = $(exec_prefix)/lib
-sharedstatedir = $(prefix)/com
-oldincludedir = $(DESTDIR)/usr/include
+sbindir = $(exec_prefix)/sbin
+rubylibdir = $(libdir)/ruby/$(ruby_version)
+docdir = $(datarootdir)/doc/$(PACKAGE)
+dvidir = $(docdir)
+vendordir = $(libdir)/ruby/vendor_ruby
+datarootdir = $(prefix)/share
 pdfdir = $(docdir)
+archdir = $(rubylibdir)/$(arch)
 sitearchdir = $(sitelibdir)/$(sitearch)
-bindir = $(exec_prefix)/bin
+datadir = $(prefix)/share
 localstatedir = $(DESTDIR)/var
 sitelibdir = $(sitedir)/$(ruby_version)
-libexecdir = $(prefix)/sbin
 
 CC = gcc
 LIBRUBY = lib$(RUBY_SO_NAME).dll.a
@@ -41,11 +44,15 @@ LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
 LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
 
 RUBY_EXTCONF_H = 
-CFLAGS   =  -g -O2  -Wall  -I/cygdrive/f/RR/Source/waveswissknife/svn/waveswissknife/external/CommonUtils/include  
+CFLAGS   =  -g -O2  $(cflags) -Wall  -I/cygdrive/c/Env/Source/waveswissknife/git/waveswissknife/external/CommonUtils/include  
 INCFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir)
-CPPFLAGS =  
+DEFS     = 
+CPPFLAGS =   $(DEFS) $(cppflags)
 CXXFLAGS = $(CFLAGS) 
-DLDFLAGS = -L.  -L/usr/local/lib -lgmp  -L/cygdrive/f/RR/Source/waveswissknife/svn/waveswissknife/external/CommonUtils/lib -lCommonUtils   -Wl,--enable-auto-image-base,--enable-auto-import,--export-all 
+ldflags  = -L.  -L/usr/local/lib -lgmp  -L/cygdrive/c/Env/Source/waveswissknife/git/waveswissknife/external/CommonUtils/lib -lCommonUtils 
+dldflags =  -Wl,--enable-auto-image-base,--enable-auto-import,--export-all
+archflag = 
+DLDFLAGS = $(ldflags) $(dldflags) $(archflag)
 LDSHARED = gcc -shared -s
 AR = ar
 EXEEXT = .exe
@@ -69,7 +76,7 @@ COPY = cp
 preload = 
 
 libpath = . $(libdir)
-LIBPATH =  -L"." -L"$(libdir)"
+LIBPATH =  -L. -L$(libdir)
 DEFFILE = 
 
 CLEANFILES = mkmf.log
@@ -87,6 +94,7 @@ DLLIB = $(TARGET).so
 EXTSTATIC = 
 STATIC_LIB = 
 
+BINDIR        = $(bindir)
 RUBYCOMMONDIR = $(sitedir)$(target_prefix)
 RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
 RUBYARCHDIR   = $(sitearchdir)$(target_prefix)

data/ext/WSK/ArithmUtils/build.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2009-2010 Muriel Salvan (murielsalvan@users.sourceforge.net)
+# Copyright (c) 2009 - 2011 Muriel Salvan (murielsalvan@users.sourceforge.net)
 # Licensed under the terms specified in LICENSE file. No warranty is provided.
 #++
 
@@ -17,4 +17,6 @@ lAdditionalLocalLibs.each do |iLibName|
   $LDFLAGS += " -L#{lLibDir}/lib -l#{iLibName} "
 end
 create_makefile('ArithmUtils')
-system('make')
+if (!system('make'))
+  raise RuntimeError.new("Error while running 'make': #{$?}")
+end

data/ext/WSK/FFTUtils/FFTUtils.c

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2009-2010 Muriel Salvan (murielsalvan@users.sourceforge.net)
+ * Copyright (c) 2009 - 2011 Muriel Salvan (murielsalvan@users.sourceforge.net)
  * Licensed under the terms specified in LICENSE file. No warranty is provided.
  **/
 

data/ext/WSK/FFTUtils/Makefile

@@ -3,62 +3,88 @@ SHELL = /bin/sh
 
 #### Start of system configuration section. ####
 
-srcdir = .
-topdir = /usr/lib/ruby/1.8/i386-cygwin
-hdrdir = $(topdir)
-VPATH = $(srcdir):$(topdir):$(hdrdir)
-prefix = $(DESTDIR)/usr
+srcdir = /C/Env/Source/waveswissknife/git/waveswissknife/ext/WSK/FFTUtils
+topdir = /C/Ruby192/include/ruby-1.9.1
+hdrdir = /C/Ruby192/include/ruby-1.9.1
+arch_hdrdir = C:/Ruby192/include/ruby-1.9.1/$(arch)
+VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby
+
+DESTDIR = C:
+prefix = $(DESTDIR)/Ruby192
+rubylibprefix = $(libdir)/$(RUBY_BASE_NAME)
 exec_prefix = $(prefix)
-sitedir = $(prefix)/lib/ruby/site_ruby
-rubylibdir = $(libdir)/ruby/$(ruby_version)
-docdir = $(datarootdir)/doc/$(PACKAGE)
-dvidir = $(docdir)
-datarootdir = $(prefix)/share
-archdir = $(rubylibdir)/$(arch)
-sbindir = $(exec_prefix)/sbin
-psdir = $(docdir)
+vendorhdrdir = $(rubyhdrdir)/vendor_ruby
+sitehdrdir = $(rubyhdrdir)/site_ruby
+rubyhdrdir = $(includedir)/$(RUBY_BASE_NAME)-$(ruby_version)
+vendordir = $(rubylibprefix)/vendor_ruby
+sitedir = $(rubylibprefix)/site_ruby
+ridir = $(datarootdir)/$(RI_BASE_NAME)
+mandir = $(datarootdir)/man
 localedir = $(datarootdir)/locale
+libdir = $(exec_prefix)/lib
+psdir = $(docdir)
+pdfdir = $(docdir)
+dvidir = $(docdir)
 htmldir = $(docdir)
-datadir = $(prefix)/share
+infodir = $(datarootdir)/info
+docdir = $(datarootdir)/doc/$(PACKAGE)
+oldincludedir = $(DESTDIR)/usr/include
 includedir = $(prefix)/include
-infodir = $(prefix)/share/info
-sysconfdir = $(DESTDIR)/etc
-mandir = $(prefix)/share/man
-libdir = $(exec_prefix)/lib
+localstatedir = $(prefix)/var
 sharedstatedir = $(prefix)/com
-oldincludedir = $(DESTDIR)/usr/include
-pdfdir = $(docdir)
-sitearchdir = $(sitelibdir)/$(sitearch)
+sysconfdir = $(prefix)/etc
+datadir = $(datarootdir)
+datarootdir = $(prefix)/share
+libexecdir = $(exec_prefix)/libexec
+sbindir = $(exec_prefix)/sbin
 bindir = $(exec_prefix)/bin
-localstatedir = $(DESTDIR)/var
+rubylibdir = $(rubylibprefix)/$(ruby_version)
+archdir = $(rubylibdir)/$(arch)
 sitelibdir = $(sitedir)/$(ruby_version)
-libexecdir = $(prefix)/sbin
+sitearchdir = $(sitelibdir)/$(sitearch)
+vendorlibdir = $(vendordir)/$(ruby_version)
+vendorarchdir = $(vendorlibdir)/$(sitearch)
 
 CC = gcc
+CXX = g++
 LIBRUBY = lib$(RUBY_SO_NAME).dll.a
 LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
 LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
 LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
+OUTFLAG = -o 
+COUTFLAG = -o 
 
 RUBY_EXTCONF_H = 
-CFLAGS   =  -g -O2  -Wall  -I/cygdrive/f/RR/Source/waveswissknife/svn/waveswissknife/external/CommonUtils/include  
-INCFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir)
-CPPFLAGS =  
-CXXFLAGS = $(CFLAGS) 
-DLDFLAGS = -L.  -L/usr/local/lib -lgmp  -L/cygdrive/f/RR/Source/waveswissknife/svn/waveswissknife/external/CommonUtils/lib -lCommonUtils   -Wl,--enable-auto-image-base,--enable-auto-import,--export-all 
-LDSHARED = gcc -shared -s
+cflags   =  $(optflags) $(debugflags) $(warnflags)
+optflags = -O3
+debugflags = -g
+warnflags = -Wextra -Wno-unused-parameter -Wno-parentheses -Wpointer-arith -Wwrite-strings -Wno-missing-field-initializers -Wno-long-long
+CFLAGS   =  $(cflags) -Wall  -IC:/Env/Source/waveswissknife/git/waveswissknife/external/CommonUtils/include  
+INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir)
+DEFS     = 
+CPPFLAGS =   $(DEFS) $(cppflags)
+CXXFLAGS = $(CFLAGS) $(cxxflags)
+ldflags  = -L.  -L/usr/local/lib -lgmp  -LC:/Env/Source/waveswissknife/git/waveswissknife/external/CommonUtils/lib -lCommonUtils 
+dldflags =  -Wl,--enable-auto-image-base,--enable-auto-import $(DEFFILE)
+ARCH_FLAG = 
+DLDFLAGS = $(ldflags) $(dldflags)
+LDSHARED = $(CC) -shared $(if $(filter-out -g -g0,$(debugflags)),,-s)
+LDSHAREDXX = $(CXX) -shared $(if $(filter-out -g -g0,$(debugflags)),,-s)
 AR = ar
 EXEEXT = .exe
 
+RUBY_BASE_NAME = ruby
 RUBY_INSTALL_NAME = ruby
-RUBY_SO_NAME = ruby
-arch = i386-cygwin
-sitearch = i386-cygwin
-ruby_version = 1.8
-ruby = /usr/bin/ruby
+RUBY_SO_NAME = msvcrt-ruby191
+arch = i386-mingw32
+sitearch = i386-msvcrt
+ruby_version = 1.9.1
+ruby = C:/Ruby192/bin/ruby
 RUBY = $(ruby)
 RM = rm -f
-MAKEDIRS = mkdir -p
+RM_RF = $(RUBY) -run -e rm -- -rf
+RMDIRS = $(RUBY) -run -e rmdir -- -p
+MAKEDIRS = /usr/bin/mkdir -p
 INSTALL = /usr/bin/install -c
 INSTALL_PROG = $(INSTALL) -m 0755
 INSTALL_DATA = $(INSTALL) -m 644
@@ -69,17 +95,18 @@ COPY = cp
 preload = 
 
 libpath = . $(libdir)
-LIBPATH =  -L"." -L"$(libdir)"
-DEFFILE = 
+LIBPATH =  -L. -L$(libdir)
+DEFFILE = $(TARGET)-$(arch).def
 
-CLEANFILES = mkmf.log
+CLEANFILES = mkmf.log $(DEFFILE)
 DISTCLEANFILES = 
+DISTCLEANDIRS = 
 
 extout = 
 extout_prefix = 
 target_prefix = 
 LOCAL_LIBS = 
-LIBS = $(LIBRUBYARG_SHARED)  -ldl -lcrypt  
+LIBS = $(LIBRUBYARG_SHARED)  -lshell32 -lws2_32  
 SRCS = FFTUtils.c
 OBJS = FFTUtils.o
 TARGET = FFTUtils
@@ -87,31 +114,44 @@ DLLIB = $(TARGET).so
 EXTSTATIC = 
 STATIC_LIB = 
 
+BINDIR        = $(bindir)
 RUBYCOMMONDIR = $(sitedir)$(target_prefix)
 RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
 RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
+HDRDIR        = $(rubyhdrdir)/ruby$(target_prefix)
+ARCHHDRDIR    = $(rubyhdrdir)/$(arch)/ruby$(target_prefix)
 
 TARGET_SO     = $(DLLIB)
-CLEANLIBS     = $(TARGET).so $(TARGET).il? $(TARGET).tds $(TARGET).map
-CLEANOBJS     = *.o *.a *.s[ol] *.pdb *.exp *.bak
-
-all:		$(DLLIB)
-static:		$(STATIC_LIB)
-
-clean:
+CLEANLIBS     = $(TARGET).so 
+CLEANOBJS     = *.o  *.bak
+
+all:    $(DLLIB)
+static: $(STATIC_LIB)
+.PHONY: all install static install-so install-rb
+.PHONY: clean clean-so clean-rb
+
+clean-rb-default::
+clean-rb::
+clean-so::
+clean: clean-so clean-rb-default clean-rb
 		@-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
 
-distclean:	clean
+distclean-rb-default::
+distclean-rb::
+distclean-so::
+distclean: clean distclean-so distclean-rb-default distclean-rb
 		@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
 		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
+		@-$(RMDIRS) $(DISTCLEANDIRS)
 
-realclean:	distclean
+realclean: distclean
 install: install-so install-rb
 
 install-so: $(RUBYARCHDIR)
 install-so: $(RUBYARCHDIR)/$(DLLIB)
 $(RUBYARCHDIR)/$(DLLIB): $(DLLIB)
-	$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
+	@-$(MAKEDIRS) $(@D)
+	$(INSTALL_PROG) $(DLLIB) $(@D)
 install-rb: pre-install-rb install-rb-default
 install-rb-default: pre-install-rb-default
 pre-install-rb: Makefile
@@ -123,27 +163,27 @@ site-install: site-install-so site-install-rb
 site-install-so: install-so
 site-install-rb: install-rb
 
-.SUFFIXES: .c .m .cc .cxx .cpp .C .o
+.SUFFIXES: .c .m .cc .cxx .cpp .o
 
 .cc.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
 
 .cxx.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
 
 .cpp.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
-
-.C.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
 
 .c.o:
-	$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) -c $<
+	$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<
 
-$(DLLIB): $(OBJS)
-	@-$(RM) $@
+$(DLLIB): $(DEFFILE) $(OBJS) Makefile
+	@-$(RM) $(@)
 	$(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
 
 
 
-$(OBJS): ruby.h defines.h
+$(DEFFILE): 
+	$(RUBY) -e "puts 'EXPORTS', 'Init_$(TARGET)'"  > $@
+
+$(OBJS): $(hdrdir)/ruby.h $(hdrdir)/ruby/defines.h $(arch_hdrdir)/ruby/config.h

data/ext/WSK/FFTUtils/build.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2009-2010 Muriel Salvan (murielsalvan@users.sourceforge.net)
+# Copyright (c) 2009 - 2011 Muriel Salvan (murielsalvan@users.sourceforge.net)
 # Licensed under the terms specified in LICENSE file. No warranty is provided.
 #++
 
@@ -17,4 +17,6 @@ lAdditionalLocalLibs.each do |iLibName|
   $LDFLAGS += " -L#{lLibDir}/lib -l#{iLibName} "
 end
 create_makefile('FFTUtils')
-system('make')
+if (!system('make'))
+  raise RuntimeError.new("Error while running 'make': #{$?}")
+end

data/ext/WSK/FunctionUtils/FunctionUtils.c

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2009-2010 Muriel Salvan (murielsalvan@users.sourceforge.net)
+ * Copyright (c) 2009 - 2011 Muriel Salvan (murielsalvan@users.sourceforge.net)
  * Licensed under the terms specified in LICENSE file. No warranty is provided.
  **/
 

data/ext/WSK/FunctionUtils/Makefile

@@ -7,32 +7,35 @@ srcdir = .
 topdir = /usr/lib/ruby/1.8/i386-cygwin
 hdrdir = $(topdir)
 VPATH = $(srcdir):$(topdir):$(hdrdir)
-prefix = $(DESTDIR)/usr
 exec_prefix = $(prefix)
-sitedir = $(prefix)/lib/ruby/site_ruby
-rubylibdir = $(libdir)/ruby/$(ruby_version)
-docdir = $(datarootdir)/doc/$(PACKAGE)
-dvidir = $(docdir)
-datarootdir = $(prefix)/share
-archdir = $(rubylibdir)/$(arch)
-sbindir = $(exec_prefix)/sbin
+prefix = $(DESTDIR)/usr
+sharedstatedir = $(prefix)/com
+mandir = $(prefix)/share/man
 psdir = $(docdir)
+oldincludedir = $(DESTDIR)/usr/include
 localedir = $(datarootdir)/locale
+bindir = $(exec_prefix)/bin
+libexecdir = $(prefix)/sbin
+sitedir = $(libdir)/ruby/site_ruby
 htmldir = $(docdir)
-datadir = $(prefix)/share
+vendorarchdir = $(vendorlibdir)/$(sitearch)
 includedir = $(prefix)/include
 infodir = $(prefix)/share/info
+vendorlibdir = $(vendordir)/$(ruby_version)
 sysconfdir = $(DESTDIR)/etc
-mandir = $(prefix)/share/man
 libdir = $(exec_prefix)/lib
-sharedstatedir = $(prefix)/com
-oldincludedir = $(DESTDIR)/usr/include
+sbindir = $(exec_prefix)/sbin
+rubylibdir = $(libdir)/ruby/$(ruby_version)
+docdir = $(datarootdir)/doc/$(PACKAGE)
+dvidir = $(docdir)
+vendordir = $(libdir)/ruby/vendor_ruby
+datarootdir = $(prefix)/share
 pdfdir = $(docdir)
+archdir = $(rubylibdir)/$(arch)
 sitearchdir = $(sitelibdir)/$(sitearch)
-bindir = $(exec_prefix)/bin
+datadir = $(prefix)/share
 localstatedir = $(DESTDIR)/var
 sitelibdir = $(sitedir)/$(ruby_version)
-libexecdir = $(prefix)/sbin
 
 CC = gcc
 LIBRUBY = lib$(RUBY_SO_NAME).dll.a
@@ -41,11 +44,15 @@ LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
 LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
 
 RUBY_EXTCONF_H = 
-CFLAGS   =  -g -O2  -Wall  -I/cygdrive/f/RR/Source/waveswissknife/svn/waveswissknife/external/CommonUtils/include  
+CFLAGS   =  -g -O2  $(cflags) -Wall  -I/cygdrive/c/Env/Source/waveswissknife/git/waveswissknife/external/CommonUtils/include  
 INCFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir)
-CPPFLAGS =  
+DEFS     = 
+CPPFLAGS =   $(DEFS) $(cppflags)
 CXXFLAGS = $(CFLAGS) 
-DLDFLAGS = -L.  -L/usr/local/lib -lgmp  -L/cygdrive/f/RR/Source/waveswissknife/svn/waveswissknife/external/CommonUtils/lib -lCommonUtils   -Wl,--enable-auto-image-base,--enable-auto-import,--export-all 
+ldflags  = -L.  -L/usr/local/lib -lgmp  -L/cygdrive/c/Env/Source/waveswissknife/git/waveswissknife/external/CommonUtils/lib -lCommonUtils 
+dldflags =  -Wl,--enable-auto-image-base,--enable-auto-import,--export-all
+archflag = 
+DLDFLAGS = $(ldflags) $(dldflags) $(archflag)
 LDSHARED = gcc -shared -s
 AR = ar
 EXEEXT = .exe
@@ -69,7 +76,7 @@ COPY = cp
 preload = 
 
 libpath = . $(libdir)
-LIBPATH =  -L"." -L"$(libdir)"
+LIBPATH =  -L. -L$(libdir)
 DEFFILE = 
 
 CLEANFILES = mkmf.log
@@ -87,6 +94,7 @@ DLLIB = $(TARGET).so
 EXTSTATIC = 
 STATIC_LIB = 
 
+BINDIR        = $(bindir)
 RUBYCOMMONDIR = $(sitedir)$(target_prefix)
 RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
 RUBYARCHDIR   = $(sitearchdir)$(target_prefix)

data/ext/WSK/FunctionUtils/build.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2009-2010 Muriel Salvan (murielsalvan@users.sourceforge.net)
+# Copyright (c) 2009 - 2011 Muriel Salvan (murielsalvan@users.sourceforge.net)
 # Licensed under the terms specified in LICENSE file. No warranty is provided.
 #++
 
@@ -17,4 +17,6 @@ lAdditionalLocalLibs.each do |iLibName|
   $LDFLAGS += " -L#{lLibDir}/lib -l#{iLibName} "
 end
 create_makefile('FunctionUtils')
-system('make')
+if (!system('make'))
+  raise RuntimeError.new("Error while running 'make': #{$?}")
+end