Commit 6defefb2 authored by Ignacio Solis's avatar Ignacio Solis

Merge pull request #8 from isolis/isolis-add-upstream

Add upstream to repositories when checked out
parents 9601ff57 6a72741c
......@@ -61,7 +61,8 @@ include ${DISTILLERY_DEFAULT_CONFIG}
# LD_RUN_PATH: add our install dir
export PATH := $(DISTILLERY_INSTALL_DIR)/bin:$(DISTILLERY_TOOLS_DIR)/bin:$(PATH)
export LD_RUN_PATH := $(DISTILLERY_INSTALL_DIR)/lib
#export LD_RUN_PATH := $(DISTILLERY_INSTALL_DIR)/lib
#export LD_LIBRARY_PATH := $(DISTILLERY_INSTALL_DIR)/lib
export CCNX_HOME
export FOUNDATION_HOME
......@@ -132,7 +133,7 @@ ${modules_status}:
${modules_fetch}:
@#cd Module_dir; git fetch
@cd $(@:.fetch=); \
git fetch
git fetch --all
${modules_nuke}:
@#cd Module_dir; git fetch
......@@ -181,7 +182,7 @@ dependencies.clobber:
pre-requisites: cmake-check
CMAKE_VERSION := $(shell PATH=${PATH} cmake --version | grep "cmake version 3.4" | cut -c 15-15)
CMAKE_VERSION := $(shell PATH=${PATH} cmake --version | grep "cmake version 3" | cut -c 15-15)
cmake-check:
@if [ ! x${CMAKE_VERSION} = x3 ]; then \
make cmake-notfound ; exit 1 ; \
......
......@@ -30,10 +30,9 @@
# to change it to your local github enterprise.
DISTILLERY_GITHUB_SERVER=github.com
#DISTILLERY_GITHUB_SOURCE_USER=PARC
# This is the Distillery GitHub source user. It's where the source comes from.
# It may be used to do code fetches
DISTILLERY_GITHUB_SOURCE_USER?=PARC
#DISTILLERY_GITHUB_UPSTREAM_NAME=parc_upstream
# This is the name to use for the upstream in the repositories
DISTILLERY_GITHUB_UPSTREAM_NAME?=parc_upstream
# DISTILLERY_GITHUB_USER?=PARC
# This is the user that will be used to generate the module github URLs.
......
......@@ -11,16 +11,20 @@ LONGBOW_BUILD_DIR=${DISTILLERY_BUILD_DIR}/${LONGBOW_MODULE_NAME}
LONGBOW_GIT_CONFIG=${LONGBOW_SOURCE_DIR}/.git/config
LONGBOW_GIT_REPOSITORY=https://${DISTILLERY_GITHUB_SERVER}/${DISTILLERY_GITHUB_USER}/LongBow
LONGBOW_GIT_UPSTREAM_REPOSITORY=https://github.com/PARC/LongBow
modules_dir+=${LONGBOW_SOURCE_DIR}
# init target, called to initialize the module, normally this would do a git
# checkout or download the source/binary from somewhere
LongBow.init: ${LONGBOW_GIT_CONFIG}
@cd ${LONGBOW_SOURCE_DIR} && git pull
@echo ${LONGBOW_SOURCE_DIR}
@cd ${LONGBOW_SOURCE_DIR} && git pull && git fetch --all
${LONGBOW_GIT_CONFIG}:
@git clone ${LONGBOW_GIT_REPOSITORY} ${LONGBOW_SOURCE_DIR}
@cd ${LONGBOW_SOURCE_DIR} && git remote add \
${DISTILLERY_GITHUB_UPSTREAM_NAME} ${LONGBOW_GIT_UPSTREAM_REPOSITORY}
LongBow.build: ${LONGBOW_BUILD_DIR}/Makefile
${MAKE} ${MAKE_BUILD_FLAGS} -C ${LONGBOW_BUILD_DIR}
......
......@@ -11,16 +11,20 @@ LIBPARC_BUILD_DIR=${DISTILLERY_BUILD_DIR}/${LIBPARC_MODULE_NAME}
LIBPARC_GIT_CONFIG=${LIBPARC_SOURCE_DIR}/.git/config
LIBPARC_GIT_REPOSITORY=https://${DISTILLERY_GITHUB_SERVER}/${DISTILLERY_GITHUB_USER}/Libparc
LIBPARC_GIT_UPSTREAM_REPOSITORY=https://github.com/PARC/Libparc
modules_dir+=${LIBPARC_SOURCE_DIR}
# init target, called to initialize the module, normally this would do a git
# checkout or download the source/binary from somewhere
Libparc.init: ${LIBPARC_GIT_CONFIG}
@cd ${LIBPARC_SOURCE_DIR} && git pull
@echo ${LIBPARC_SOURCE_DIR}
@cd ${LIBPARC_SOURCE_DIR} && git pull && git fetch --all
${LIBPARC_GIT_CONFIG}:
@git clone ${LIBPARC_GIT_REPOSITORY} ${LIBPARC_SOURCE_DIR}
@cd ${LIBPARC_SOURCE_DIR} && git remote add \
${DISTILLERY_GITHUB_UPSTREAM_NAME} ${LIBPARC_GIT_UPSTREAM_REPOSITORY}
Libparc.build: ${LIBPARC_BUILD_DIR}/Makefile
${MAKE} ${MAKE_BUILD_FLAGS} -C ${LIBPARC_BUILD_DIR}
......
......@@ -11,16 +11,20 @@ LIBCCNX_BUILD_DIR=${DISTILLERY_BUILD_DIR}/${LIBCCNX_MODULE_NAME}
LIBCCNX_GIT_CONFIG=${LIBCCNX_SOURCE_DIR}/.git/config
LIBCCNX_GIT_REPOSITORY=https://${DISTILLERY_GITHUB_SERVER}/${DISTILLERY_GITHUB_USER}/Libccnx-common
LIBCCNX_GIT_UPSTREAM_REPOSITORY=https://github.com/PARC/Libccnx-common
modules_dir+=${LIBCCNX_SOURCE_DIR}
# init target, called to initialize the module, normally this would do a git
# checkout or download the source/binary from somewhere
Libccnx-common.init: ${LIBCCNX_GIT_CONFIG}
@cd ${LIBCCNX_SOURCE_DIR} && git pull
@echo ${LIBCCNX_SOURCE_DIR}
@cd ${LIBCCNX_SOURCE_DIR} && git pull && git fetch --all
${LIBCCNX_GIT_CONFIG}:
@git clone ${LIBCCNX_GIT_REPOSITORY} ${LIBCCNX_SOURCE_DIR}
@cd ${LIBCCNX_SOURCE_DIR} && git remote add \
${DISTILLERY_GITHUB_UPSTREAM_NAME} ${LIBCCNX_GIT_UPSTREAM_REPOSITORY}
Libccnx-common.build: ${LIBCCNX_BUILD_DIR}/Makefile
${MAKE} ${MAKE_BUILD_FLAGS} -C ${LIBCCNX_BUILD_DIR}
......
......@@ -11,16 +11,20 @@ LIBCCNX_TRANSPORT_RTA_BUILD_DIR=${DISTILLERY_BUILD_DIR}/${LIBCCNX_TRANSPORT_RTA_
LIBCCNX_TRANSPORT_RTA_GIT_CONFIG=${LIBCCNX_TRANSPORT_RTA_SOURCE_DIR}/.git/config
LIBCCNX_TRANSPORT_RTA_GIT_REPOSITORY=https://${DISTILLERY_GITHUB_SERVER}/${DISTILLERY_GITHUB_USER}/Libccnx-transport-rta
LIBCCNX_TRANSPORT_RTA_GIT_UPSTREAM_REPOSITORY=https://github.com/PARC/Libccnx-transport-rta
modules_dir+=${LIBCCNX_TRANSPORT_RTA_SOURCE_DIR}
# init target, called to initialize the module, normally this would do a git
# checkout or download the source/binary from somewhere
Libccnx-transport-rta.init: ${LIBCCNX_TRANSPORT_RTA_GIT_CONFIG}
@cd ${LIBCCNX_TRANSPORT_RTA_SOURCE_DIR} && git pull
@echo ${LIBCCNX_TRANSPORT_RTA_SOURCE_DIR}
@cd ${LIBCCNX_TRANSPORT_RTA_SOURCE_DIR} && git pull && git fetch --all
${LIBCCNX_TRANSPORT_RTA_GIT_CONFIG}:
@git clone ${LIBCCNX_TRANSPORT_RTA_GIT_REPOSITORY} ${LIBCCNX_TRANSPORT_RTA_SOURCE_DIR}
@cd ${LIBCCNX_TRANSPORT_RTA_SOURCE_DIR} && git remote add \
${DISTILLERY_GITHUB_UPSTREAM_NAME} ${LIBCCNX_TRANSPORT_RTA_GIT_UPSTREAM_REPOSITORY}
Libccnx-transport-rta.build: ${LIBCCNX_TRANSPORT_RTA_BUILD_DIR}/Makefile
${MAKE} ${MAKE_BUILD_FLAGS} -C ${LIBCCNX_TRANSPORT_RTA_BUILD_DIR}
......
......@@ -11,16 +11,20 @@ LIBCCNX_PORTAL_BUILD_DIR=${DISTILLERY_BUILD_DIR}/${LIBCCNX_PORTAL_MODULE_NAME}
LIBCCNX_PORTAL_GIT_CONFIG=${LIBCCNX_PORTAL_SOURCE_DIR}/.git/config
LIBCCNX_PORTAL_GIT_REPOSITORY=https://${DISTILLERY_GITHUB_SERVER}/${DISTILLERY_GITHUB_USER}/Libccnx-portal
LIBCCNX_PORTAL_GIT_UPSTREAM_REPOSITORY=https://github.com/PARC/Libccnx-portal
modules_dir+=${LIBCCNX_PORTAL_SOURCE_DIR}
# init target, called to initialize the module, normally this would do a git
# checkout or download the source/binary from somewhere
Libccnx-portal.init: ${LIBCCNX_PORTAL_GIT_CONFIG}
@cd ${LIBCCNX_PORTAL_SOURCE_DIR} && git pull
@echo ${LIBCCNX_PORTAL_SOURCE_DIR}
@cd ${LIBCCNX_PORTAL_SOURCE_DIR} && git pull && git fetch --all
${LIBCCNX_PORTAL_GIT_CONFIG}:
@git clone ${LIBCCNX_PORTAL_GIT_REPOSITORY} ${LIBCCNX_PORTAL_SOURCE_DIR}
@cd ${LIBCCNX_PORTAL_SOURCE_DIR} && git remote add \
${DISTILLERY_GITHUB_UPSTREAM_NAME} ${LIBCCNX_PORTAL_GIT_UPSTREAM_REPOSITORY}
Libccnx-portal.build: ${LIBCCNX_PORTAL_BUILD_DIR}/Makefile
${MAKE} ${MAKE_BUILD_FLAGS} -C ${LIBCCNX_PORTAL_BUILD_DIR}
......
......@@ -11,16 +11,20 @@ METIS_BUILD_DIR=${DISTILLERY_BUILD_DIR}/${METIS_MODULE_NAME}
METIS_GIT_CONFIG=${METIS_SOURCE_DIR}/.git/config
METIS_GIT_REPOSITORY=https://${DISTILLERY_GITHUB_SERVER}/${DISTILLERY_GITHUB_USER}/Metis
METIS_GIT_UPSTREAM_REPOSITORY=https://github.com/PARC/Metis
modules_dir+=${METIS_SOURCE_DIR}
# init target, called to initialize the module, normally this would do a git
# checkout or download the source/binary from somewhere
Metis.init: ${METIS_GIT_CONFIG}
@cd ${METIS_SOURCE_DIR} && git pull
@echo ${METIS_SOURCE_DIR}
@cd ${METIS_SOURCE_DIR} && git pull && git fetch --all
${METIS_GIT_CONFIG}:
@git clone ${METIS_GIT_REPOSITORY} ${METIS_SOURCE_DIR}
@cd ${METIS_SOURCE_DIR} && git remote add \
${DISTILLERY_GITHUB_UPSTREAM_NAME} ${METIS_GIT_UPSTREAM_REPOSITORY}
Metis.build: ${METIS_BUILD_DIR}/Makefile
${MAKE} ${MAKE_BUILD_FLAGS} -C ${METIS_BUILD_DIR}
......
......@@ -11,16 +11,20 @@ ATHENA_BUILD_DIR=${DISTILLERY_BUILD_DIR}/${ATHENA_MODULE_NAME}
ATHENA_GIT_CONFIG=${ATHENA_SOURCE_DIR}/.git/config
ATHENA_GIT_REPOSITORY=https://${DISTILLERY_GITHUB_SERVER}/${DISTILLERY_GITHUB_USER}/Athena
ATHENA_GIT_UPSTREAM_REPOSITORY=https://github.com/PARC/Athena
modules_dir+=${ATHENA_SOURCE_DIR}
# init target, called to initialize the module, normally this would do a git
# checkout or download the source/binary from somewhere
Athena.init: ${ATHENA_GIT_CONFIG}
@cd ${ATHENA_SOURCE_DIR} && git pull
@echo ${ATHENA_SOURCE_DIR}
@cd ${ATHENA_SOURCE_DIR} && git pull && git fetch --all
${ATHENA_GIT_CONFIG}:
@git clone ${ATHENA_GIT_REPOSITORY} ${ATHENA_SOURCE_DIR}
@cd ${ATHENA_SOURCE_DIR} && git remote add \
${DISTILLERY_GITHUB_UPSTREAM_NAME} ${ATHENA_GIT_UPSTREAM_REPOSITORY}
Athena.build: ${ATHENA_BUILD_DIR}/Makefile
${MAKE} ${MAKE_BUILD_FLAGS} -C ${ATHENA_BUILD_DIR}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment