From 1061cf52dddeea00978df3f5947742ae29c0345e Mon Sep 17 00:00:00 2001
From: Mick Jordan <mick.jordan@oracle.com>
Date: Tue, 5 May 2015 17:38:40 -0700
Subject: [PATCH] correct naming for test package dirs
---
.../packages/package.mk | 7 +--
.../packages/testrffi/src/src/Makefile | 59 -------------------
.../testrffi/{src => testrffi}/DESCRIPTION | 0
.../testrffi/{src => testrffi}/NAMESPACE | 0
.../testrffi/{src => testrffi}/R/testrffi.R | 0
.../{src => testrffi}/man/testrffi-package.Rd | 0
.../{src => testrffi}/man/testrffi.Rd | 0
.../testrffi/{src => testrffi}/src/init.c | 0
.../testrffi/{src => testrffi}/src/testrffi.c | 0
.../vanilla/{src => vanilla}/DESCRIPTION | 0
.../vanilla/{src => vanilla}/NAMESPACE | 0
.../vanilla/{src => vanilla}/R/vanilla.R | 0
.../{src => vanilla}/man/vanilla-package.Rd | 0
.../vanilla/{src => vanilla}/man/vanilla.Rd | 0
14 files changed, 2 insertions(+), 64 deletions(-)
delete mode 100644 com.oracle.truffle.r.test.native/packages/testrffi/src/src/Makefile
rename com.oracle.truffle.r.test.native/packages/testrffi/{src => testrffi}/DESCRIPTION (100%)
rename com.oracle.truffle.r.test.native/packages/testrffi/{src => testrffi}/NAMESPACE (100%)
rename com.oracle.truffle.r.test.native/packages/testrffi/{src => testrffi}/R/testrffi.R (100%)
rename com.oracle.truffle.r.test.native/packages/testrffi/{src => testrffi}/man/testrffi-package.Rd (100%)
rename com.oracle.truffle.r.test.native/packages/testrffi/{src => testrffi}/man/testrffi.Rd (100%)
rename com.oracle.truffle.r.test.native/packages/testrffi/{src => testrffi}/src/init.c (100%)
rename com.oracle.truffle.r.test.native/packages/testrffi/{src => testrffi}/src/testrffi.c (100%)
rename com.oracle.truffle.r.test.native/packages/vanilla/{src => vanilla}/DESCRIPTION (100%)
rename com.oracle.truffle.r.test.native/packages/vanilla/{src => vanilla}/NAMESPACE (100%)
rename com.oracle.truffle.r.test.native/packages/vanilla/{src => vanilla}/R/vanilla.R (100%)
rename com.oracle.truffle.r.test.native/packages/vanilla/{src => vanilla}/man/vanilla-package.Rd (100%)
rename com.oracle.truffle.r.test.native/packages/vanilla/{src => vanilla}/man/vanilla.Rd (100%)
diff --git a/com.oracle.truffle.r.test.native/packages/package.mk b/com.oracle.truffle.r.test.native/packages/package.mk
index a0eac0052b..27379351e2 100644
--- a/com.oracle.truffle.r.test.native/packages/package.mk
+++ b/com.oracle.truffle.r.test.native/packages/package.mk
@@ -23,13 +23,10 @@
# This "builds" a test package, resulting in a tar file,
# which is then loaded by the unit tests in TestRPackages.
-# Note that the tar file root must be a single directoru but
-# the name is unimportant because the install process takes the
-# package name from the DESCRIPTION. So we just use the "src" directory.
.PHONY: all
-PKG_FILES = $(shell find src/ -type f -name '*')
+PKG_FILES = $(shell find $(PACKAGE)/ -type f -name '*')
PKG_TAR = lib/$(PACKAGE).tar
@@ -37,7 +34,7 @@ all: $(PKG_TAR)
$(PKG_TAR): $(PKG_FILES)
mkdir -p lib
- tar cf $(PKG_TAR) src
+ tar cf $(PKG_TAR) $(PACKAGE)
clean:
rm -f $(PKG_TAR)
diff --git a/com.oracle.truffle.r.test.native/packages/testrffi/src/src/Makefile b/com.oracle.truffle.r.test.native/packages/testrffi/src/src/Makefile
deleted file mode 100644
index 4419b3fcf6..0000000000
--- a/com.oracle.truffle.r.test.native/packages/testrffi/src/src/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-.PHONY: all clean
-
-C_SOURCES := $(wildcard *.c)
-# R uses the .so extension on Mac OS X
-C_OBJECTS := $(C_SOURCES:.c=.o)
-C_LIB := testrffi.so
-
-NATIVE_PROJECT=$(FASTR_HOME)/com.oracle.truffle.r.native
-ifneq ($(MAKECMDGOALS),clean)
-include $(NATIVE_PROJECT)/platform.mk
-endif
-
-ifeq ($(FASTR_INSTALL), GNUR)
- INCLUDES := -I $(R_HOME)/include
- ifeq ($(OS_NAME), Darwin)
- FRAMEWORKFLAGS := -F${R_HOME}/../.. -framework R
- else
- FRAMEWORKFLAGS :=
- endif
- LDFLAGS := $(LDFLAGS) $(FRAMEWORKFLAGS)
-else
- INCLUDES := -I $(NATIVE_PROJECT)/include/jni/include -I $(FASTR_JAVA_HOME)/include -I $(FASTR_JAVA_HOME)/include/$(OS_DIR)
-endif
-
-
-all: $(C_LIB)
-
-$(C_LIB): $(C_OBJECTS)
- $(DYLIB_LD) $(DYLIB_LDFLAGS) -o $(C_LIB) $(C_OBJECTS)
-
-%.o: %.c
- $(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
-
-clean:
- rm $(C_LIB) $(C_OBJECTS)
-
diff --git a/com.oracle.truffle.r.test.native/packages/testrffi/src/DESCRIPTION b/com.oracle.truffle.r.test.native/packages/testrffi/testrffi/DESCRIPTION
similarity index 100%
rename from com.oracle.truffle.r.test.native/packages/testrffi/src/DESCRIPTION
rename to com.oracle.truffle.r.test.native/packages/testrffi/testrffi/DESCRIPTION
diff --git a/com.oracle.truffle.r.test.native/packages/testrffi/src/NAMESPACE b/com.oracle.truffle.r.test.native/packages/testrffi/testrffi/NAMESPACE
similarity index 100%
rename from com.oracle.truffle.r.test.native/packages/testrffi/src/NAMESPACE
rename to com.oracle.truffle.r.test.native/packages/testrffi/testrffi/NAMESPACE
diff --git a/com.oracle.truffle.r.test.native/packages/testrffi/src/R/testrffi.R b/com.oracle.truffle.r.test.native/packages/testrffi/testrffi/R/testrffi.R
similarity index 100%
rename from com.oracle.truffle.r.test.native/packages/testrffi/src/R/testrffi.R
rename to com.oracle.truffle.r.test.native/packages/testrffi/testrffi/R/testrffi.R
diff --git a/com.oracle.truffle.r.test.native/packages/testrffi/src/man/testrffi-package.Rd b/com.oracle.truffle.r.test.native/packages/testrffi/testrffi/man/testrffi-package.Rd
similarity index 100%
rename from com.oracle.truffle.r.test.native/packages/testrffi/src/man/testrffi-package.Rd
rename to com.oracle.truffle.r.test.native/packages/testrffi/testrffi/man/testrffi-package.Rd
diff --git a/com.oracle.truffle.r.test.native/packages/testrffi/src/man/testrffi.Rd b/com.oracle.truffle.r.test.native/packages/testrffi/testrffi/man/testrffi.Rd
similarity index 100%
rename from com.oracle.truffle.r.test.native/packages/testrffi/src/man/testrffi.Rd
rename to com.oracle.truffle.r.test.native/packages/testrffi/testrffi/man/testrffi.Rd
diff --git a/com.oracle.truffle.r.test.native/packages/testrffi/src/src/init.c b/com.oracle.truffle.r.test.native/packages/testrffi/testrffi/src/init.c
similarity index 100%
rename from com.oracle.truffle.r.test.native/packages/testrffi/src/src/init.c
rename to com.oracle.truffle.r.test.native/packages/testrffi/testrffi/src/init.c
diff --git a/com.oracle.truffle.r.test.native/packages/testrffi/src/src/testrffi.c b/com.oracle.truffle.r.test.native/packages/testrffi/testrffi/src/testrffi.c
similarity index 100%
rename from com.oracle.truffle.r.test.native/packages/testrffi/src/src/testrffi.c
rename to com.oracle.truffle.r.test.native/packages/testrffi/testrffi/src/testrffi.c
diff --git a/com.oracle.truffle.r.test.native/packages/vanilla/src/DESCRIPTION b/com.oracle.truffle.r.test.native/packages/vanilla/vanilla/DESCRIPTION
similarity index 100%
rename from com.oracle.truffle.r.test.native/packages/vanilla/src/DESCRIPTION
rename to com.oracle.truffle.r.test.native/packages/vanilla/vanilla/DESCRIPTION
diff --git a/com.oracle.truffle.r.test.native/packages/vanilla/src/NAMESPACE b/com.oracle.truffle.r.test.native/packages/vanilla/vanilla/NAMESPACE
similarity index 100%
rename from com.oracle.truffle.r.test.native/packages/vanilla/src/NAMESPACE
rename to com.oracle.truffle.r.test.native/packages/vanilla/vanilla/NAMESPACE
diff --git a/com.oracle.truffle.r.test.native/packages/vanilla/src/R/vanilla.R b/com.oracle.truffle.r.test.native/packages/vanilla/vanilla/R/vanilla.R
similarity index 100%
rename from com.oracle.truffle.r.test.native/packages/vanilla/src/R/vanilla.R
rename to com.oracle.truffle.r.test.native/packages/vanilla/vanilla/R/vanilla.R
diff --git a/com.oracle.truffle.r.test.native/packages/vanilla/src/man/vanilla-package.Rd b/com.oracle.truffle.r.test.native/packages/vanilla/vanilla/man/vanilla-package.Rd
similarity index 100%
rename from com.oracle.truffle.r.test.native/packages/vanilla/src/man/vanilla-package.Rd
rename to com.oracle.truffle.r.test.native/packages/vanilla/vanilla/man/vanilla-package.Rd
diff --git a/com.oracle.truffle.r.test.native/packages/vanilla/src/man/vanilla.Rd b/com.oracle.truffle.r.test.native/packages/vanilla/vanilla/man/vanilla.Rd
similarity index 100%
rename from com.oracle.truffle.r.test.native/packages/vanilla/src/man/vanilla.Rd
rename to com.oracle.truffle.r.test.native/packages/vanilla/vanilla/man/vanilla.Rd
--
GitLab