version 0.3-2

cran · Jan 10, 2012 · 9355b0b · 9355b0b
1 parent 966184d
commit 9355b0b
Show file tree

Hide file tree

Showing 10 changed files with 102 additions and 53 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,17 @@
+2012-01-10  Tomoaki NISHIYAMA  <tomoakin@kenroku.asrc.kanazawa-u.ac.jp>
+
+	Windows support for r-devel.
+	Make libpq.a with ar directly from $(OBJ) not via dll.
+	Thus, install.libs.R is no more required.
+
+	* ChangeLog
+	* DESCRIPTION
+	* src/Makevars.win
+	* src/install.libs.R: delete
+	* src/libpq/Makefile.global.win64
+	* src/libpq/Makefile.win
+	* src/libpq/Makefile.shlib
+
 2011-12-31  Tomoaki NISHIYAMA  <tomoakin@kenroku.asrc.kanazawa-u.ac.jp>
 
 	Move conditionals from Makevars.in to configure.in and

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,22 +1,25 @@
 Package: RPostgreSQL
-Version: 0.3-1
-Date: $Date: 2011-12-31 22:11:32 +0900 (Sat, 31 Dec 2011) $
+Version: 0.3-2
+Date: $Date: 2012-01-10 17:51:04 +0900 (Tue, 10 Jan 2012) $
 Title: R interface to the PostgreSQL database system
-Author: Joe Conway, Dirk Eddelbuettel, Tomoaki Nishiyama, Sameer Kumar Prayaga (during 2008), Neil Tiffin
+Author: Joe Conway, Dirk Eddelbuettel, Tomoaki Nishiyama, Sameer Kumar
+        Prayaga (during 2008), Neil Tiffin
 Maintainer: Tomoaki Nishiyama <tomoakin@kenroku.kanazawa-u.ac.jp>
-Description: Database interface and PostgreSQL driver for R
- This package provides a Database Interface (DBI) compliant 
- driver for R to access PostgreSQL database systems.  
+Description: Database interface and PostgreSQL driver for R This
+        package provides a Database Interface (DBI) compliant driver
+        for R to access PostgreSQL database systems.
  .
-   In order to build and install this package from source, PostgreSQL 
- itself must be present your system to provide PostgreSQL functionality 
- via its libraries and header files. These files are provided as
- postgresql-devel package under some Linux distributions.
+ In order to build and install this package from source, PostgreSQL
+        itself must be present your system to provide PostgreSQL
+        functionality via its libraries and header files. These files
+        are provided as postgresql-devel package under some Linux
+        distributions.
  .
-   On Microsoft Windows system the attached libpq library source will be used.
+ On Microsoft Windows system the attached libpq library source will be
+        used.
  .
-   A wiki and issue tracking system for the package are available
- at Google Code at https://code.google.com/p/rpostgresql/ .
+ A wiki and issue tracking system for the package are available at
+        Google Code at https://code.google.com/p/rpostgresql/ .
 LazyLoad: true
 Depends: R (>= 2.9.0), methods, DBI (>= 0.1-4)
 License: GPL-2 | file LICENSE
@@ -25,6 +28,6 @@ Copyright: Authors listed above, PostgreSQL Global Development Group,
 Collate: S4R.R zzz.R PostgreSQLSupport.R dbObjectId.R PostgreSQL.R
 URL: https://code.google.com/p/rpostgresql/,
         http://www.stat.bell-labs.com/RS-DBI, http://www.postgresql.org
-Packaged: 2011-12-31 13:12:39 UTC; tomoaki
+Packaged: 2012-01-29 03:09:44 UTC; tomoaki
 Repository: CRAN
-Date/Publication: 2012-01-03 06:33:07
+Date/Publication: 2012-01-29 08:27:40
diff --git a/MD5 b/MD5
@@ -1,5 +1,5 @@
-aac9af6888dbb9e73590669d2abf8b27 *ChangeLog
-c735d3fc6a786ac1e2b53869a40f3c9f *DESCRIPTION
+aef2d888019c9177bd90d119cf100074 *ChangeLog
+a5fdfbf118713a32d60634c36234d8ec *DESCRIPTION
 2627b2b4195d23fd892e25c925a01f93 *LICENSE
 07abd6526506cad69dacbcd85056df39 *NAMESPACE
 2d9f70685a274782a6294593052b35c9 *R/PostgreSQL.R
@@ -14,7 +14,7 @@ cd97f90bb8f96381bc90618f20f92e37 *config.guess
 5efe73308b630ae004ec81ea9d4ee802 *configure.in
 d41d8cd98f00b204e9800998ecf8427e *configure.win
 a93eb17deebc9c9f4831891d57225b88 *inst/ANNOUNCEMENT
-955d38471d059fdf5135aa37568c05e9 *inst/NEWS
+32b052e58d5822469b1f49497c824ec0 *inst/NEWS
 86063092fe732dcbc47a4830ca72703c *inst/README
 b73cbf6aae0e4d6ece79307f8a86713f *inst/THANKS
 f9bf927d77f5afe307d48292d82b935f *inst/TODO
@@ -25,7 +25,7 @@ b42cfbf562a28612beb8acfe0f716c61 *inst/devTests/demo.r
 0cda913b0e5e9141de5ee02ce25bff4d *inst/devTests/timeTypeComparison.r
 5c86f87f1eb660bf799f2a6e49e75175 *inst/devTests/transactionManagement.r
 cb8f0f0ce13da24f66f2ac2422cdbc01 *inst/devTests/typeTest.r
-5fa18684f6c5b889b22098ef5bd902b7 *inst/doc/DBI.pdf
+6c99a753f2a33515fa567d241aa18e31 *inst/doc/DBI.pdf
 d41d8cd98f00b204e9800998ecf8427e *install-sh
 3189110650497edadc574cf9deda2e7a *man/PostgreSQL.Rd
 34be8b01589cc63c1e2c14fc923a0296 *man/PostgreSQLConnection-class.Rd
@@ -54,7 +54,7 @@ efefe77c91468729e7f3f44d2baa9e96 *man/postgresqlDBApply.Rd
 53c37275687ec67b72eecaee8864148f *man/postgresqlSupport.Rd
 1fa83980e75922372ce35309a6d37ab7 *man/summary-methods.Rd
 d6e06acf69eb5a72bba126285917aeab *src/Makevars.in
-369b2e58786107e237d9b802c91e5ad2 *src/Makevars.win
+28b4fca3fd3ae85de4b1d1bb480c0837 *src/Makevars.win
 cc7a9148d6dd10737d8d920f477ecd22 *src/RS-DBI.c
 998b2d43ef87d0b5b6e5e286b1766d8f *src/RS-DBI.h
 36dbad7938bb2d8b33267b7363c8ef09 *src/RS-PQescape.c
@@ -64,16 +64,15 @@ a097d25581003eb54dba6f63338e0ad4 *src/RS-PostgreSQL.h
 6422d3349928db0c1b94509e8b1d7557 *src/RS-pgsql-getResult.c
 3029b173216fd1941bc6c9d4fbbd3249 *src/RS-pgsql-pqexec.c
 25f7757eb3ce49bd5c0faf5d38995a84 *src/S4R.h
-77057ba352b034dc40f586b1d1bc366e *src/install.libs.R
 ef344a9f1740fa86ca1465e306fc30bf *src/libpq/COPYRIGHT
 70210c09c015458c661a500f794d90cd *src/libpq/Makefile.darwin
 ad0f605aa54b56a24bad2eaff5f9e770 *src/libpq/Makefile.global.darwin
 68fccef5a928cb81f1ac95bc34d722f2 *src/libpq/Makefile.global.win32
-8f0de03c91bc82b1e1aeb7db7887615e *src/libpq/Makefile.global.win64
+5383f13063f1577be46ad2ffc0a4de93 *src/libpq/Makefile.global.win64
 27f3f61b48248452f421f708fcc383ca *src/libpq/Makefile.port
 cd612b52f4c8225182a8dbd899de2b18 *src/libpq/Makefile.port.darwin
-647192f64017e456bf5e06f3863e5b6a *src/libpq/Makefile.shlib
-47e0409e9d91e5d88113ea064cf86444 *src/libpq/Makefile.win
+41b44e9dffa16c318c046aaa40132309 *src/libpq/Makefile.shlib
+11674cf44e470a958990dbf33e7b2d21 *src/libpq/Makefile.win
 92c6d2478320dcb7596b189e1404f462 *src/libpq/README
 81fa40bc86309f5f19a5173a0691fc0e *src/libpq/bcc32.mak
 f6603683fd65a79d90fe3e5036416d98 *src/libpq/blibpqdll.def

diff --git a/inst/NEWS b/inst/NEWS
@@ -1,3 +1,14 @@
+Version 0.3-2 -- 2012-01-10
+
+    o   Adapt to the new windows toolchain.
+
+    o   Do not make libpq.dll on windows but just make libpq.a and link it,
+        so that libpq.dll need not copied anymore.
+
+Version 0.3-1 -- 2011-12-31
+
+    o   Remove GNU make dependency.
+
 Version 0.3-0 -- 2011-12-29
 
     o   The bundled libpq source codes are used under darwin as well.

diff --git a/inst/doc/DBI.pdf b/inst/doc/DBI.pdf
diff --git a/src/Makevars.win b/src/Makevars.win
@@ -1,9 +1,11 @@
 PKG_CPPFLAGS=-I./libpq
-PKG_LIBS=libpq/libpq.a
+PKG_LIBS=libpq/libpq.a -lshfolder -lwsock32 -lws2_32 -lsecur32
 
 .PHONY: all 
 all:  $(SHLIB)
 $(SHLIB): libpq/libpq.a
 
+export CC
+
 libpq/libpq.a:
 	(cd libpq; make -f Makefile.win)
diff --git a/src/install.libs.R b/src/install.libs.R
diff --git a/src/libpq/Makefile.global.win64 b/src/libpq/Makefile.global.win64
@@ -51,7 +51,7 @@ endif
 vpathsearch = `for f in $(addsuffix /$(1),$(subst :, ,. $(VPATH))); do test -r $$f && echo $$f && break; done`
 
 # Saved arguments from configure
-configure_args =  '--host=x86_64-w64-mingw32' '--without-zlib' 'host_alias=x86_64-w64-mingw32'
+# configure_args =  '--host=x86_64-w64-mingw32' '--without-zlib' 'host_alias=x86_64-w64-mingw32'
 
 
 ##########################################################################
@@ -201,7 +201,8 @@ PTHREAD_LIBS		=
 
 # Compilers
 
-CPP = x86_64-w64-mingw32-gcc -E
+#CPP = x86_64-w64-mingw32-gcc -E
+# hope this is set appropriately by the system
 CPPFLAGS =  -I./src/include/port/win32 -DEXEC_BACKEND 
 
 ifdef PGXS
@@ -213,7 +214,14 @@ override CPPFLAGS := -I$(top_builddir)/src/include $(CPPFLAGS)
 endif
 endif # not PGXS
 
-CC = x86_64-w64-mingw32-gcc
+#CC = x86_64-w64-mingw32-gcc
+ifeq ($(CC),gcc)
+CC=gcc -m64
+endif
+ifeq "$(CC)" "x86_64-w64-mingw32-gcc "
+CC=x86_64-w64-mingw32-gcc
+endif
+# hope this variable is set appropriately by the system
 GCC = yes
 SUN_STUDIO_CC = no
 CFLAGS = -O2 -Wall -Wmissing-prototypes -Wpointer-arith -Wdeclaration-after-statement -Wendif-labels -Wformat-security -fno-strict-aliasing -fwrapv
@@ -230,14 +238,23 @@ ZIC =
 
 # Linking
 
+ifeq "$(CC)" "x86_64-w64-mingw32-gcc"
 AR = x86_64-w64-mingw32-ar
+endif
+# hope this variable is set appropriately by the system
+ifeq "$(CC)" "x86_64-w64-mingw32-gcc"
 DLLTOOL = x86_64-w64-mingw32-dlltool
 DLLWRAP = x86_64-w64-mingw32-dllwrap
+else
+DLLTOOL = dlltool -m64
+DLLWRAP = dllwrap -m64
+endif
 LIBS = -lwsock32 -lm 
 LDAP_LIBS_FE = 
 LDAP_LIBS_BE = 
 OSSP_UUID_LIBS = 
-LD = c:/rtools/mingw64/x86_64-w64-mingw32/bin/ld.exe
+#LD = c:/rtools/mingw64/x86_64-w64-mingw32/bin/ld.exe
+# hope this variable is set appropriately by the system
 with_gnu_ld = yes
 ld_R_works = 
 
@@ -257,8 +274,14 @@ LDFLAGS_EX =
 LDFLAGS_SL += 
 LDREL = -r
 LDOUT = -o
+
+ifeq "$(CC)" "x86_64-w64-mingw32-gcc"
 RANLIB = x86_64-w64-mingw32-ranlib
 WINDRES = x86_64-w64-mingw32-windres
+else
+RANLIB = ranlib
+WINDRES = windres -F pe-x86-64
+endif
 X = .exe
 
 # Perl
@@ -305,9 +328,15 @@ MKDIR_P = /bin/mkdir -p
 
 missing		= $(SHELL) $(top_srcdir)/config/missing
 
+ifeq "$(CC)" "x86_64-w64-mingw32-gcc"
 STRIP		= x86_64-w64-mingw32-strip
 STRIP_STATIC_LIB = x86_64-w64-mingw32-strip -x
 STRIP_SHARED_LIB = x86_64-w64-mingw32-strip --strip-unneeded
+else
+STRIP		= strip
+STRIP_STATIC_LIB = strip -x
+STRIP_SHARED_LIB = strip --strip-unneeded
+endif
 
 # Documentation
 

diff --git a/src/libpq/Makefile.shlib b/src/libpq/Makefile.shlib
@@ -409,11 +409,22 @@ else
 DLL_DEFFILE = lib$(NAME)dll.def
 endif
 
+ifeq "$(WIN)"  "64"
+$(shlib): $(OBJS) $(DLL_DEFFILE) 
+	$(LD) -shared --dll -o $@ $(OBJS) $(DLL_DEFFILE)
+ifeq "$(AR)" "x86_64-w64-mingw32-ar"
+$(stlib): $(OBJS)
+	$(AR) rcs $@ $(OBJS)
+else
+$(stlib): $(OBJS)
+	$(AR) rcs --target pe-x86-64 $@ $(OBJS)
+endif
+else
 $(shlib): $(OBJS) $(DLL_DEFFILE) 
 	$(DLLWRAP) -o $@ --dllname $(shlib) $(DLLWRAP_FLAGS) --def $(DLL_DEFFILE) $(OBJS) $(LDFLAGS) $(LDFLAGS_SL) $(SHLIB_LINK)
-
-$(stlib): $(shlib) $(DLL_DEFFILE) 
-	$(DLLTOOL) --dllname $(shlib) $(DLLTOOL_LIBFLAGS) --def $(DLL_DEFFILE) --output-lib $@
+$(stlib): $(OBJS)
+	$(AR) rcs $@ $(OBJS)
+endif
 
 endif # PORTNAME == cygwin || PORTNAME == win32
 

diff --git a/src/libpq/Makefile.win b/src/libpq/Makefile.win
@@ -88,7 +88,7 @@ endif
 
 SHLIB_EXPORTS = exports.txt
 
-all: all-lib
+all: all-static-lib
 
 # Shared library stuff
 include Makefile.shlib