Merge branch 'develop'

OpenConext-Attic · Sep 6, 2013 · 26f5ead · 26f5ead
2 parents 4ade723 + d212847
commit 26f5ead
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 37 deletions.
diff --git a/bin/makeRelease.sh b/bin/makeRelease.sh
@@ -27,66 +27,55 @@ else
     TAG=$1
 fi
 
+PROJECT_DIR_NAME=${PROJECT_NAME}-${TAG}
+PROJECT_DIR=${RELEASE_DIR}/${PROJECT_DIR_NAME}
+
+# Create empty dir
 mkdir -p ${RELEASE_DIR}
-rm -rf ${RELEASE_DIR}/${PROJECT_NAME}
+rm -rf ${PROJECT_DIR}
 
 # get Composer
-(
 cd ${RELEASE_DIR}
 curl -O http://getcomposer.org/composer.phar
-)
 
 # clone the tag
-(
 cd ${RELEASE_DIR}
-    git clone -b ${TAG} https://github.com/${GITHUB_USER}/${PROJECT_NAME}.git
-)
+git clone -b ${TAG} https://github.com/${GITHUB_USER}/${PROJECT_NAME}.git ${PROJECT_DIR_NAME}
 
 # run Composer
-(
-cd ${RELEASE_DIR}/${PROJECT_NAME}
+cd ${PROJECT_DIR}
 php ${RELEASE_DIR}/composer.phar install --no-dev
-)
 
 # remove files that are not required for production
-(
-rm -rf ${RELEASE_DIR}/${PROJECT_NAME}/.idea
-rm -rf ${RELEASE_DIR}/${PROJECT_NAME}/.git
-rm -f ${RELEASE_DIR}/${PROJECT_NAME}/.gitignore
-rm -f ${RELEASE_DIR}/${PROJECT_NAME}/composer.json
-rm -f ${RELEASE_DIR}/${PROJECT_NAME}/composer.lock
-rm -f ${RELEASE_DIR}/${PROJECT_NAME}/makeRelease.sh
-rm -f ${RELEASE_DIR}/${PROJECT_NAME}/bin/composer.phar
-rm -f ${RELEASE_DIR}/${PROJECT_NAME}/bin/mergeJsonFiles.php
-rm -f ${RELEASE_DIR}/${PROJECT_NAME}/bin/simplesamlphp-post-install.sh
-rm -rf ${RELEASE_DIR}/${PROJECT_NAME}/tests
-rm -rf ${RELEASE_DIR}/${PROJECT_NAME}/config
-rm -rf ${RELEASE_DIR}/${PROJECT_NAME}/metadata
-rm -rf ${RELEASE_DIR}/${PROJECT_NAME}/janus-dictionaries
-rm -rf ${RELEASE_DIR}/${PROJECT_NAME}/simplesamlphp_patches
-)
+rm -rf ${PROJECT_DIR}/.idea
+rm -rf ${PROJECT_DIR}/.git
+rm -f ${PROJECT_DIR}/.gitignore
+rm -f ${PROJECT_DIR}/composer.json
+rm -f ${PROJECT_DIR}/composer.lock
+rm -f ${PROJECT_DIR}/makeRelease.sh
+rm -f ${PROJECT_DIR}/bin/composer.phar
+rm -f ${PROJECT_DIR}/bin/mergeJsonFiles.php
+rm -f ${PROJECT_DIR}/bin/simplesamlphp-post-install.sh
+rm -rf ${PROJECT_DIR}/tests
+rm -rf ${PROJECT_DIR}/config
+rm -rf ${PROJECT_DIR}/metadata
+rm -rf ${PROJECT_DIR}/janus-dictionaries
+rm -rf ${PROJECT_DIR}/simplesamlphp_patches
 
 # create tarball
-(
 cd ${RELEASE_DIR}
-
-tar -czf ${PROJECT_NAME}-${TAG}.tar.gz ${PROJECT_NAME}
-)
+tar -czf ${PROJECT_DIR_NAME}.tar.gz ${PROJECT_DIR_NAME}
 
 # create checksum file
-(
 cd ${RELEASE_DIR}
-shasum ${PROJECT_NAME}-${TAG}.tar.gz > ${PROJECT_NAME}.sha
-)
+shasum ${PROJECT_DIR_NAME}.tar.gz > ${PROJECT_DIR_NAME}.sha
 
 # sign it if requested
-(
 if [ -n "$2" ]
 then
 	if [ "$2" == "sign" ]
 	then
 		cd ${RELEASE_DIR}
-		gpg -o ${PROJECT_NAME}.sha.gpg  --clearsign ${PROJECT_NAME}.sha
+		gpg -o ${PROJECT_DIR_NAME}.sha.gpg  --clearsign ${PROJECT_DIR_NAME}.sha
 	fi
-fi
-)
+fi
diff --git a/config/module_janus_metadata_fields.php b/config/module_janus_metadata_fields.php
@@ -235,7 +235,10 @@
         'coin:implicit_vo_id'           => array(),
 
         'coin:transparant_issuer'       => array('type' => 'boolean'),
-        'coin:do_not_add_attribute_aliases' => array('type' => 'boolean', 'default' => FALSE)
+        'coin:do_not_add_attribute_aliases' => array('type' => 'boolean', 'default' => FALSE),
+
+        // Do we need to show all Idp's in the WAYF with the unconnected ones grey-out
+        'coin:display_unconnected_idps_wayf' => array('type' => 'boolean', 'default' => FALSE)
     ),
 );
 

diff --git a/docs/release_notes/v3.7.1.md b/docs/release_notes/v3.7.1.md
@@ -0,0 +1,5 @@
+# SURFnet SURFconext v3.7.1 Release Notes #
+
+Feature/Bugfix release
+* Updated make release script so that the dir in tar contains a version nr
+* Part of: Added field for implementation for BACKLOG-1103 to mark SPs for displaying all unfiltered IDPs, this only adds a - perhaps unused - metadata field