Merge pull request #6 from fledge-iot/1.8.0RC

1.8.0 rc

Author: YashTatkondawar

README.rst

@@ -1,6 +1,6 @@
 
 .. Links
-.. _main repository: https://github.com/fledge/Fledge
+.. _main repository: https://github.com/fledge-iot/fledge
 
 
 *****************************

docker/Dockerfile

@@ -9,9 +9,9 @@ RUN apt-get install -y git rsyslog
 
 WORKDIR /fledge-core
 
-RUN git clone --single-branch -b $FLEDGE_BRANCH https://github.com/fledge/Fledge.git 
+RUN git clone --single-branch -b $FLEDGE_BRANCH https://github.com/fledge-iot/fledge.git
 
-RUN cd Fledge && \
+RUN cd fledge && \
 	chmod +x requirements.sh && \
 	./requirements.sh && \
 	make install
@@ -28,7 +28,7 @@ VOLUME /usr/local/fledge/data
 
 # These Volumes will be used in future when we want to install plugins
 VOLUME /usr/local/fledge
-VOLUME /fledge-core/Fledge
+VOLUME /fledge-core/fledge
 
 EXPOSE 8081 1995
 

make_rpm

@@ -22,7 +22,7 @@
 set -e
 
 PKG_ROOT=`pwd`               # The script must be executed from the root git directory
-repo_name="Fledge"           # Name of the Git repository
+repo_name="fledge"           # Name of the Git repository
 branch="master"              # Default Git branch to use
 pkg_name="fledge"           # Name of the package to build
 architecture="x86_64"        # The architecture for which the rpm should be created
@@ -83,7 +83,7 @@ while getopts ":hcasb:" opt; do
   esac
 done
 
-if [ ! -f packages/rpmbuild/SPECS/fledge.spec ] ; then
+if [ ! -f packages/RPM/SPECS/fledge.spec ] ; then
 	echo You must run this script from the fledge-pkg directory
 	exit 1
 fi
@@ -97,7 +97,7 @@ if [[ $skip_build == 0 ]]; then
 		echo WARNING: Repository ${repo_name} already exists, using the existing copy
 		(cd ${repo_name}; git fetch --all; git pull ; git checkout "$branch")
 	else
-		git clone -b "$branch" https://github.com/fledge/${repo_name}.git
+		git clone -b "$branch" https://github.com/fledge-iot/${repo_name}.git
 	fi
 
 	GIT_ROOT=/tmp/"${repo_name}"
@@ -167,7 +167,7 @@ if [[ ! -d "${FLEDGE_ROOT}" ]]; then
 fi
 
 version=`cat ${FLEDGE_ROOT}/VERSION | tr -d ' ' | grep 'fledge_version=' | head -1 | sed -e 's/\(.*\)=\(.*\)/\2/g'`
-BUILD_ROOT="${PKG_ROOT}/packages/rpmbuild/BUILDROOT"
+BUILD_ROOT="${PKG_ROOT}/packages/RPM/build/BUILDROOT"
 
 mkdir -p ${PKG_ROOT}/packages/RPM/build/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS}
 mkdir -p ${PKG_ROOT}/packages/RPM/build/RPMS/x86_64

plugins/make_deb

@@ -83,7 +83,7 @@ do
 		echo WARNING: Repository ${REPO_NAME} already exists, using the existing copy
 		(cd ${REPO_NAME}; git pull; git checkout "${BRANCH_NAME}")
 	else
-		git clone -b ${BRANCH_NAME} --single-branch https://github.com/fledge/${REPO_NAME}.git
+		git clone -b ${BRANCH_NAME} --single-branch https://github.com/fledge-iot/${REPO_NAME}.git
 	fi
 
 	GIT_ROOT=/tmp/"${REPO_NAME}"
@@ -236,6 +236,13 @@ EOF
             mkdir -p usr/lib
             cp -R --preserve=links /usr/lib/libbiodaq* usr/lib
         fi
+        if [ "${plugin_name}" = "gcp-gateway" -o "${plugin_name}" = "gcp" ]; then
+            cd -
+            mkdir -p usr/local/lib
+            cp -R --preserve=links /usr/local/lib/libjwt* usr/local/lib
+            cp -R --preserve=links /usr/local/lib/libjansson* usr/local/lib
+            cp -R --preserve=links /usr/local/lib/libpaho* usr/local/lib
+        fi
     fi
     echo "Done."
 

plugins/make_rpm

@@ -96,7 +96,7 @@ do
 		echo WARNING: Repository $repos already exists, using the existing copy
 		(cd $repos; git pull; git checkout "$branch")
 	else
-		git clone -b "$branch" https://github.com/fledge/${repos}.git
+		git clone -b "$branch" https://github.com/fledge-iot/${repos}.git
 	fi
 
 	GIT_ROOT=/tmp/"$repos"

service/make_deb

@@ -87,7 +87,7 @@ do
 		echo WARNING: Repository ${REPO_NAME} already exists, using the existing copy
 		(cd ${REPO_NAME}; git pull; git checkout "${BRANCH_NAME}")
 	else
-		git clone -b ${BRANCH_NAME} --single-branch https://github.com/fledge/${REPO_NAME}.git
+		git clone -b ${BRANCH_NAME} --single-branch https://github.com/fledge-iot/${REPO_NAME}.git
 	fi
 
 	GIT_ROOT=/tmp/"${REPO_NAME}"

service/make_rpm

@@ -115,7 +115,7 @@ do
         echo WARNING: Repository ${REPO_NAME} already exists, using the existing copy
         (cd ${REPO_NAME}; git pull; git checkout "${BRANCH_NAME}")
     else
-        git clone -b "${BRANCH_NAME}" https://github.com/fledge/${REPO_NAME}.git
+        git clone -b "${BRANCH_NAME}" https://github.com/fledge-iot/${REPO_NAME}.git
     fi
 
     GIT_ROOT=/tmp/"${REPO_NAME}"