[java-parent-projects COMMIT] /java-parent-project-v3/trunk/bin/checkout.sh

[noreply at shibboleth.net]

Author: tzeller
Date: Mon Jan 13 17:49:36 2014
New Revision: 207

URL: http://svn.shibboleth.net/view/java-parent-projects?rev=207&view=rev
Log:
Subversion externals workaround no longer needed.

Modified:
    java-parent-project-v3/trunk/bin/checkout.sh

Modified: java-parent-project-v3/trunk/bin/checkout.sh
URL: http://svn.shibboleth.net/view/java-parent-projects/java-parent-project-v3/trunk/bin/checkout.sh?rev=207&r1=206&r2=207&view=diff
==============================================================================
--- java-parent-project-v3/trunk/bin/checkout.sh (original)
+++ java-parent-project-v3/trunk/bin/checkout.sh Mon Jan 13 17:49:36 2014
@@ -10,19 +10,14 @@
 $ECHO ""
 $ECHO "This script will prompt you to checkout source code from $SVN_URL."
 $ECHO ""
-$ECHO "This script is not that great, ymmv."
-$ECHO ""
 
 declare CHECKOUT_ALL=n
-declare IGNORE_EXTERNALS=n
-declare -r ECLIPSE_SETTINGS_TMP="$TMPDIR/eclipse-settings-tmp"
 
 # Prompt to checkout a project.
 function checkout {
     # $1 = utilities or "" or java-parent-projects
     # $2 = project
     # $3 = branch or tag or trunk
-	# $4 = svn options
 
     # remove / from end of project name
     local PROJ="${2%/}"
@@ -37,20 +32,9 @@
 
     read_y "Checkout $PROJ" CHECKOUT_PROJ
     if [ $CHECKOUT_PROJ == "y" ] ; then
-		CMD="$SVN checkout ${4-} $SVN_URL$SVN_PATH/$PROJ/$3 $LOCAL_PATH$PROJ"
+		CMD="$SVN checkout $SVN_URL$SVN_PATH/$PROJ/$3 $LOCAL_PATH$PROJ"
         $ECHO "$CMD"
         $CMD
-                
-        # If ignore externals was set _and_ passed as option, redundant conditional.
-		if [ "$IGNORE_EXTERNALS" ] && [[ ${4-} == --ignore-externals ]] ; then
-			if [ -n "$LOCAL_PATH" ] ; then
-        		# Copy Eclipse settings to monolithic project
-				copy_eclipse_settings "$LOCAL_PATH$PROJ"
-        	else
-        		# Copy Eclipse settings to multi-module project
-				find_and_copy_eclipse_settings $PROJ
-    		fi		
-    	fi
     fi
 }
 
@@ -73,39 +57,6 @@
     eval $_RESULTVAR="'$RESULT'"
 }
 
-# Download Eclipse .settings to newly created temporary directory
-function download_eclipse_settings {
-	check_path_not_exist $ECLIPSE_SETTINGS_TMP
-	$MKDIR -p "$ECLIPSE_SETTINGS_TMP/.settings"
-    check_retval $? "Unable to create Eclipse settings tmp directory"
-	download_eclipse_settings_files $ECLIPSE_SETTINGS_TMP
-}
-
-# Copy Eclipse .settings from temporary directory
-function find_and_copy_eclipse_settings {
-	# TODO Make safer.
-	for FILE in $(find "$1" -depth 2 -name .project -print)
-	do    	
-    	PARENT=$(dirname $FILE)
-    	copy_eclipse_settings $PARENT
-	done
-}
-
-# Copy Eclipse .settings from temporary directory to target
-function copy_eclipse_settings {
-    $ECHO "Copying Eclipse settings to $1"
-    $CP -pr "$ECLIPSE_SETTINGS_TMP/.settings" "$1/"
-}
-
-# Ignore Subversion externals definitions for V3 projects ?
-read -p "Ignore Subversion externals for V3 projects (y/n) ? [n] : " -e REPLY
-if [ -n "$REPLY" ]
-then
-    echo "Downloading Subversion externals for V3 projects"
-	IGNORE_EXTERNALS="--ignore-externals"
-	download_eclipse_settings
-fi
-
 # Checkout all
 read_y "Checkout all projects" CHECKOUT_ALL
 
@@ -123,9 +74,9 @@
 read_y "Checkout v3 projects" CHECKOUT
 if [ $CHECKOUT == "y" ] ; then
     checkout "java-parent-projects" "java-parent-project-v3" "trunk"
-    checkout "" "java-identity-provider" "trunk" $IGNORE_EXTERNALS
-    checkout "" "java-opensaml" "trunk" $IGNORE_EXTERNALS
-    checkout "" "java-metadata-aggregator" "trunk" $IGNORE_EXTERNALS
+    checkout "" "java-identity-provider" "trunk"
+    checkout "" "java-opensaml" "trunk"
+    checkout "" "java-metadata-aggregator" "trunk"
 fi
 $ECHO ""
 
@@ -138,14 +89,9 @@
     	if [[ $PROJ == cpp* ]] ; then
     		$ECHO "Ignoring $PROJ"
     	else
-    		checkout "utilities" $PROJ "trunk" $IGNORE_EXTERNALS
+    		checkout "utilities" $PROJ "trunk"
     	fi    	
     done   
 fi
+
 $ECHO ""
-
-# Cleanup temporary Eclipse settings directory
-if [ -d "$ECLIPSE_SETTINGS_TMP" ] ; then
-	echo "Deleting temporary Eclipse settings directory $ECLIPSE_SETTINGS_TMP"
-	rm -r "$ECLIPSE_SETTINGS_TMP"
-fi