update source code

src/DX_API/InvokeR/IBM_SPSS_Copyright.h

@@ -5,14 +5,14 @@
 **
 ** IBM SPSS Products: Statistics Common
 **
-** (C) Copyright IBM Corp. 1989, 2015
+** (C) Copyright IBM Corp. 1989, 2019
 **
 ** The source code for this program is not published or otherwise divested of its trade secrets, 
 ** irrespective of what has been deposited with the U.S. Copyright Office.
 ************************************************************************/
 #ifndef COPYRIGHT_STMT
 #define COPYRIGHT_STMT
 const char * Copyright = "** Licensed Materials - Property of IBM\n** IBM SPSS Products: Statistics Common \
-			** (C) Copyright IBM Corp. 1989, 2016.\n**US Government Users Restricted Rights - Use, duplication or \
+			** (C) Copyright IBM Corp. 1989, 2019.\n**US Government Users Restricted Rights - Use, duplication or \
 			disclosure restricted by GSA ADP Schedule Contract with IBM Corp.";
 #endif

src/DX_API/InvokeR/embedded.cpp

@@ -1,6 +1,6 @@
 /************************************************************************
 ** IBM?SPSS?Statistics - Essentials for R
-** (c) Copyright IBM Corp. 1989, 2015
+** (c) Copyright IBM Corp. 1989, 2018
 ** 
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License version 2 as published by
@@ -750,7 +750,7 @@ DLL_API int  pre_action()
     if(0 == curnest)
     {
         DxRunning = 1;
-        SPSS_SetSyntax("library(spss240)\nprespss()");
+        SPSS_SetSyntax("library(spss260)\nprespss()");
     }
     else
     {

src/DX_API/InvokeR/gnumak/invokeR.mk

@@ -3,7 +3,7 @@
 # *
 # * IBM SPSS Products: Statistics Common
 # *
-# * (C) Copyright IBM Corp. 1989, 2015
+# * (C) Copyright IBM Corp. 1989, 2017
 # *
 # * US Government Users Restricted Rights - Use, duplication or disclosure
 # * restricted by GSA ADP Schedule Contract with IBM Corp. 
@@ -308,12 +308,12 @@ endef
 .PHONY:all
 all:$(INVOKE_NAME)
 $(INVOKE_NAME):$(OBJECT_NAME)
-	$(CC) $(LFLAGS) $(MAC_ARCH_X64) $(LIB_PATH) $(LIBS) -o $(OUT_DIR)/$(INVOKE_NAME) $(OUT_DIR)/embedded.o
+	$(CC) -o $(OUT_DIR)/$(INVOKE_NAME) $(OUT_DIR)/embedded.o $(LFLAGS) $(MAC_ARCH_X64) $(LIB_PATH) $(LIBS)
 	$(RM)  $(OUT_DIR)/embedded.o
 
 embedded.o: $(SRC_DIR)/embedded.cpp
 	$(CreateDir)
-	$(CC) $(CFLAGS) $(MAC_ARCH_X64) $(INC_PATH) -o $(OUT_DIR)/embedded.o $(SRC_DIR)/embedded.cpp
+	$(CC) -o $(OUT_DIR)/embedded.o $(SRC_DIR)/embedded.cpp $(CFLAGS) $(MAC_ARCH_X64) $(INC_PATH)
 
 #   -- Clean output files
 .PHONY:clean

src/DX_API/InvokeR/readme

@@ -4,15 +4,15 @@ Introduction
 ------------
 This SDK directory is used to:
     -- build InvokeR Library for Windows platforms, e.g. Win32, Win64
-    -- build libInvokeR Library for UNIX platforms, e.g. AIX64, Linux64, 
+    -- build libInvokeR Library for UNIX platforms, e.g. Linux64, 
        ZLinux64, PLinux64 and MacOS  
 
 Prerequisites
 -------------
     Visual Studio 2008 has to be installed (for Windows platform).
-    R 3.2.* has to be installed (For Win32, Win64, AIX64, Linux64, MacOS, ZLinux64 and PLinux64 platforms)
+    R 3.5.* has to be installed (For Win32, Win64, Linux64, MacOS, ZLinux64 and PLinux64 platforms)
     For Windows, Rtools has to be installed. You can download it from http://cran.r-project.org/bin/windows/Rtools.
-    For Windows, pexports.exe has to be copied into <R 3.2.* installation location>\bin\i386 and <R 3.2.* installation location>\bin\x64. You can download mingw-utils-0.46.tar.gz from http://sourceforge.net/projects/mingw/files/MinGW/Extension/pexports/ 
+    For Windows, pexports.exe has to be copied into <R 3.5.* installation location>\bin\i386 and <R 3.5.* installation location>\bin\x64. You can download pexports-0.47-mingw32-bin.tar.xz from https://sourceforge.net/projects/mingw/files/MinGW/Extension/pexports/pexports-0.47/ 
     and extract pexports.exe from it.
 
 
@@ -40,7 +40,8 @@ Building Rdll.lib and Rgraphapp.lib
           pexports R.dll > R.def
           LIB /DEF:R.def /MACHINE:X64 /out:Rdll.lib
 
-          pexports Rgraphapp.dll > Rgraphapp.def
+          dumpbin /exports Rgraphapp.dll /out:Rgraphapp.def
+          <Modify the generated Rgraphapp.def to the same format with R.def>
           LIB /DEF:Rgraphapp.def /MACHINE:X64
 
   Copy Rdll.lib and Rgraphapp.lib to \...\DX_API\InvokeR\mak\libs
@@ -81,8 +82,6 @@ Output files
   Win64:
      If the project file is used, output files will be put into the \...\DX_API\InvokeR\PCBuild\x64\Release subdirectory.
      If the make file is used, output files will be put into the \...\DX_API\InvokeR\x64\Release subdirectory.
-  AIX64:
-     Output files will be put into the \...\DX_API\InvokeR\aix64 subdirectory.
   Linux64:
      Output files will be put into the \...\DX_API\InvokeR\lintel64 subdirectory.
   ZLinux64:
@@ -107,4 +106,4 @@ On UNIX platforms, copy spssdxcfg.ini to $SPSS_HOME/bin and copy the libInvokeR
 library to $SPSS_HOME/lib.
 
 
-© Copyright IBM Corp. 1989, 2015
+© Copyright IBM Corp. 1989, 2019

src/DX_API/config/spssdxcfg.ini

@@ -4,8 +4,8 @@
 ; The version of Statistics
 ; You should not change the version number, otherwise Statistics-Python package may not function properly.
 
-SpssdxVersion=24.0
-SpssdxVersionMajor=24
+SpssdxVersion=26.0
+SpssdxVersionMajor=26
 SpssdxVersionMinor=0
 
 [SUPPORTED_LANG]