SVN to GIT

.gitignore

@@ -0,0 +1,17 @@
+/dist
+dpan/dpan/authors/id/D/DP/DPAN/*.tar.gz
+dpan/dpan/authors/id/D/DP/DPAN/*.tar.gz.patched
+!dpan/dpan/authors/id/D/DP/DPAN/.gitkeep
+extensions
+/local_install
+/local_www
+/Treex-PML
+/unix_install
+/virtualenv
+win32_strawberry/perl/*
+!win32_strawberry/perl/.gitkeep
+/win32_strawberry/*.exe
+/unix_install_pkgs/deb/tred_3*
+/unix_install_pkgs/rpm/tred-3*
+/dpan/dpan/indexing_log
+/admin/7zExtra

Makefile

@@ -133,7 +133,7 @@ make-changelog:
 # - TrEd version number (based on SVN revision)
 # - compile the documentation from DocBook and POD (tred/devel/make_manual)
 # - updated extensions dir (SVN working copy)
-update-dist-dir: make-changelog
+update-dist-dir: make-changelog extensions
 	cd admin && ./update-dist-dir.sh
 
 
@@ -184,3 +184,10 @@ compile-treex-pml-dist:
 install-treex-pml:
 	cd admin && ./install-treex-pml.sh
 
+
+
+#### Extensions repository
+extensions:
+	GIT_DIR=`pwd` && \
+	. admin/env.sh && \
+	git clone $${TRED_GIT_EXT} $${TRED_EXT_DIR}

admin/create_installer_with_strawberry_perl.sh

@@ -13,7 +13,7 @@ function get_strawberry() {
 }
 
 if [ -z "$VER" ]; then
-    VER=`$DIST_DIR/tred/devel/update_version.pl -n ${TRED_SVN_REPO}`
+    VER=`$DIST_DIR/tred/devel/update_version.pl -n`
 fi
 
 

admin/create_tred_packages.sh

@@ -22,7 +22,7 @@ WWW="$3"
 SFX=$(dirname $0)/7zExtra/7zS.sfx
 
 if [ -z "$VER" ]; then
-    VER=`$DIST_DIR/tred/devel/update_version.pl -n ${TRED_SVN_REPO}`
+    VER=`$DIST_DIR/tred/devel/update_version.pl -n`
 fi
 
 cd "$DIST_DIR"
@@ -33,7 +33,7 @@ PKG="tred-current.tar.gz"
 DATE="$(LANG=C date)"
 
 # update revision numbers in tred source tree
-perl -pi -e 's/our \$VERSION = "SVN_VERSION"/our \$VERSION = "'$VER'"/g' tred/tredlib/TrEd/Version.pm
+perl -pi -e 's/our \$VERSION = "DEV_VERSION"/our \$VERSION = "'$VER'"/g' tred/tredlib/TrEd/Version.pm
 # update revision numbers in index.html
 perl -pi~ -e "s/tred-(?:current|[0-9.]+?)\\.tar\\.gz/${PKG}/g; s/Current version:.*</Current version: ${VER} (release date ${DATE})</g" ${WWW}/index.html
 

admin/env_refactored.sh

@@ -1,19 +1,19 @@
 #!/bin/bash
 
-# Root dir of the SVN checkout. All dirs are derived from this one
-if [ -z "$SVN_DIR" ]; then
-    SVN_DIR=$(dirname $(dirname $(dirname $(readlink -fen $0))))
+# Root dir of the GIT checkout. All dirs are derived from this one
+if [ -z "$GIT_DIR" ]; then
+    GIT_DIR=$(dirname $(dirname $(readlink -fen $0)))
 fi
 
 
 # Installation prefix -- documentation goes to $INSTALL_BASE/doc,
 # binaries go to $INSTALL_BASE/exec,
 # libraries go to $INSTALL_BASE/lib,
 # extensions to $INSTALL_BASE/share
-INSTALL_BASE=${SVN_DIR}/local_install
+INSTALL_BASE=${GIT_DIR}/local_install
 
 # Local (source) web tree
-WWW=${SVN_DIR}/local_www
+WWW=${GIT_DIR}/local_www
 export TREDWWW=$WWW
 
 # Remote web tree (of the testbed)
@@ -24,12 +24,13 @@ REMOTE_WWW=${TESTING_SERVER}:/var/www/tred/testbed
 # The selected user should log there without password (by certificate)
 LOGIN_NAME=tred
 
+PYTHON_ENV=${GIT_DIR}/virtualenv
 
 # TrEd project direcotry (from which Makefile is executed)
-PROJECT_DIR=${SVN_DIR}/trunk
+PROJECT_DIR=${GIT_DIR}
 
-# Log for svn checkouts and exports during make
-LOG=$SVN_DIR/trunk/make_log
+# Log for git checkouts and exports during make
+LOG=$GIT_DIR/make_log
 
 TRED_HOME_URL="http://ufallab.ms.mff.cuni.cz:24080/tred/testbed"
 TRED_EXTENSIONS_URL=""
@@ -62,12 +63,18 @@ INSTALL_DOC=${INSTALL_BASE}/doc
 RSS=${WWW}/tred/changelog.rss
 
 # Basic paths
-TRED_SVN=https://svn.ms.mff.cuni.cz/svn/TrEd
+TRED_SVN=SVN:ERROR--https://svn.ms.mff.cuni.cz/svn/TrEd
 TRED_SVN_REPO=${TRED_SVN}/trunk/tred_refactored
 TRED_SVN_EXT=${TRED_SVN}/extensions
 TREEX_PML_REPO=https://svn.ms.mff.cuni.cz/svn/perl_libs/trunk/distribution/Treex-PML
 WIN32_DIST_REPO=https://svn.ms.mff.cuni.cz/svn/perl_libs/trunk/distribution/win32_build_script
 
+TRED_FOLDER=tred_refactored
+TRED_GIT_REPO=${GIT_DIR}/${TRED_FOLDER}
+[email protected]:ufal/TrEd-extensions.git
+# https://github.com/ufal/TrEd-extensions.git
+
+
 # PROJECT_DIR=/net/work/projects/tred
 ADMIN_DIR=${PROJECT_DIR}/admin
 DIST_DIR=${PROJECT_DIR}/dist
@@ -89,8 +96,8 @@ TREEX_PML_EXPORT=${PROJECT_DIR}/generated/Treex-PML
 # mutli-script to run jobs on the SGE cluster
 LRC_CMD=${ADMIN_DIR}/run_on_lrc
 
-# SVN to ChangeLog conversion
-SVN_TO_CHANGELOG=${ADMIN_DIR}/svn2cl/svn2cl.sh
+# GIT to ChangeLog conversion
+GIT_TO_CHANGELOG=${PYTHON_ENV}/bin/git-changelog
 # ChangeLog to RSS conversion
 CHANGELOG_TO_RSS=${ADMIN_DIR}/changelog2rss.pl
 
@@ -101,7 +108,7 @@ CHANGELOG_TO_RSS=${ADMIN_DIR}/changelog2rss.pl
 
 
 ## MAC OS settings
-MAC_RELEASER=[email protected]
+MAC_RELEASER=mMcBair.local
 MAC_TRED_INSTALLATION='~/tred_installation'
 MAC_TRED_INSTALLATION_OLD='~/tred_installation_old'
-MAC_SVN_DIR='~/TrEd'
+MAC_GIT_DIR='~/work/TrEd'

admin/mac_backup_previous.sh

@@ -3,5 +3,5 @@
 . env.sh
 ssh $MAC_RELEASER <<EOF
   rm -rf $MAC_TRED_INSTALLATION_OLD;
-  mv $MAC_TRED_INSTALLATION $MAC_TRED_INSTALLATION_OLD;
+  mv $MAC_TRED_INSTALLATION $MAC_TRED_INSTALLATION_OLD || echo "no previous release to backup";
 EOF

admin/mac_download_release.sh

@@ -2,12 +2,12 @@
 
 . env.sh
 
-SVN_VERSION=`svn info . | grep 'Revision:' | sed -E 's/[^0-9]+//g'`
+GIT_DATE=`git log -1 --date=format:"%Y%m%d" --format="%ad"|tr -d "\n"`
 
 echo "Copying tred.dmg to local www"
 scp $MAC_RELEASER:$MAC_TRED_INSTALLATION/tred.dmg "${TREDWWW}/tred/"
 
 # keep history of released versions in subdir releases/osx
 mkdir -p "${TREDWWW}/tred/releases/osx" 2>/dev/null
-DMG_FILE="tred_2.${SVN_VERSION}.dmg"
+DMG_FILE="tred_3.${GIT_DATE}.dmg"
 cp "${TREDWWW}/tred/tred.dmg" "${TREDWWW}/tred/releases/osx/$DMG_FILE"

admin/mac_prepare.sh

@@ -9,6 +9,6 @@ scp ${WWW}/tred/tred-current.tar.gz $MAC_RELEASER:$MAC_TRED_INSTALLATION
 scp ${WWW}/tred/tred-dep-unix.tar.gz $MAC_RELEASER:$MAC_TRED_INSTALLATION
 ssh $MAC_RELEASER <<EOF
     chmod +x $MAC_TRED_INSTALLATION/install_tred.bash
-	cd TrEd && svn update || echo "Unable to update repository. Do it manually if needed!!!\nContinues without repository updated.\n"
-	cd ~/TrEd/trunk/osx_install/bin && ./unpack.sh && mv release-template.dmg ../scripts
+	cd ${MAC_GIT_DIR} && git pull  || echo "Unable to update repository. Do it manually if needed!!!\nContinues without repository updated.\n"
+	cd ${MAC_GIT_DIR}/osx_install/bin && ./unpack.sh && mv release-template.dmg ../scripts
 EOF

admin/mac_release.sh

@@ -5,9 +5,9 @@ SIGNATURE=$1
 . env.sh
 
 ssh $MAC_RELEASER <<EOF
-  #  . ~/.bash_profile
-  #  echo "======== perl version"
-  #  perlbrew info
-  #  echo "========"
-	cd $MAC_SVN_DIR/trunk/osx_install/scripts && ./make-release.sh $SIGNATURE
+  . ~/perl5/perlbrew/etc/bashrc
+  echo "======== perl version"
+  perlbrew info
+  echo "========"
+	cd ${MAC_GIT_DIR}/osx_install/scripts && ./make-release.sh $SIGNATURE
 EOF

admin/make-changelog.sh

@@ -1,32 +1,14 @@
 #!/bin/bash
-# Create changelog from svn log
+# Create changelog from git log
 
 EXTDIR=`dirname $(readlink -fen $0)`
 . "$EXTDIR"/env.sh
+. ${PYTHON_ENV}/bin/activate
 
 echo "Generating changelog" && \
-echo "Updating svn..." && \
-svn update ${TRED_SRC_DIR} >> $LOG && \
+echo "Updating git..." && \
+git pull >> $LOG && \
 echo "done" && \
-
-# find the current revision number of svn
-# LAST_COMMIT_NO=`svn info ${TRED_SRC_DIR} | grep "Revision:" | cut -d ':' -f 2 | cut -d ' ' -f 2` && \
-# 
-# if [ -a ${TRED_SRC_DIR}/ChangeLog ]; then
-# 	# if ChangeLog exists, we should update it only if it does not already contain the last revision
-# 	LAST_COMMIT_IN_CHANGELOG=`grep -c "r$LAST_COMMIT_NO" ${TRED_SRC_DIR}/ChangeLog`
-# else
-# 	# if ChangeLog does not exist, it needs to be created
-# 	LAST_COMMIT_IN_CHANGELOG=0
-# fi && \
-
-## echo "LAST_COMMIT_NO = $LAST_COMMIT_NO"
-## echo "LAST_COMMIT_IN_CHANGELOG = $LAST_COMMIT_IN_CHANGELOG"
-
-# if [ "$LAST_COMMIT_IN_CHANGELOG" == 0 ]; then
-	echo "Transforming svn log --> ChangeLog (this takes a while)..." && \
-	cd ${TRED_SRC_DIR} && ${SVN_TO_CHANGELOG} --include-rev -o ChangeLog && \
-# else
-# 	echo "ChangeLog is already up to date."
-# fi && \
+echo "Transforming git log --> ChangeLog (this takes a while)..." && \
+cd ${TRED_SRC_DIR} && ${GIT_TO_CHANGELOG} > ChangeLog && \
 echo "Done"

admin/prepare-tred-web-release.sh

@@ -22,9 +22,9 @@ cp -f ${TRED_DIST_DIR}/documentation/refactoring/TrEd_refactoring.pdf ${WWW}/tre
 ##change urls in index.html to point to the directory of that index, should be changed when there is another place for TrEd
 xsh2 -P ${WWW}/tred/index.html 'nobackups; rm //*[@class="offline"]; map :i { s{^TRED_HOME_URL/}{} } //@href;' && \
 
-# Fix SVN version in links and text...
-SVN_VERSION=`svn info . | grep 'Revision:' | sed -E 's/[^0-9]+//g'`
-sed -i "s/(SVN:VERSION)/$SVN_VERSION/g" ${WWW}/tred/index.html
+# Fix git date version in links and text...
+GIT_DATE=`git log -1 --date=format:"%Y%m%d" --format="%ad"|tr -d "\n"`
+sed -i "s/(GIT:DATE)/$GIT_DATE/g" ${WWW}/tred/index.html
 
 ##ATT if we want ActivePerl ppm packages
 # we need to run win32_ppm/get_packages_tred_58 a get_packages_tred_510.sh before this is run

admin/prereq.sh

@@ -27,37 +27,6 @@ function perl_module_presence_and_version_test {
     fi
 }
 
-# This funcition downloads current version of svn2cl script from web,
-# compares its MD5 sum to the MD5 sum found on the web and
-# unpacks it, if the MD5 sum is correct
-function get_svn2cl {
-	### svn2cl
-	SVN2CL_URL="https://arthurdejong.org/svn2cl/"
-	SVN2CL_FILE_DL="svn2cl.tar.gz"
-	wget ${SVN2CL_URL}downloads.html -O web >> $LOG
-
-	NEWEST_SVN2CL=`grep -o "svn2cl-[0-9.]\+tar.gz" web | head -n 1`
-	wget -nv ${SVN2CL_URL}${NEWEST_SVN2CL} -O $SVN2CL_FILE_DL >> $LOG
-	wget -nv ${SVN2CL_URL}${NEWEST_SVN2CL}.md5 -O ${SVN2CL_FILE_DL}.md5 >> $LOG
-
-	SVN2CL_MD5_WEB=`cut -d ' ' -f 1 $SVN2CL_FILE_DL.md5`
-	SVN2CL_MD5_LOCAL=`md5sum $SVN2CL_FILE_DL | cut -d ' ' -f 1`
-
-	if [ "$SVN2CL_MD5_WEB" == "$SVN2CL_MD5_LOCAL" ]; then
-		echo "MD5 sum ok, extracting svn2cl.."
-		tar xvzf $SVN2CL_FILE_DL -C $ADMIN_DIR
-		# remove the version of the svn2cl from dir name
-		mv ${ADMIN_DIR}/svn2cl*/ ${ADMIN_DIR}/svn2cl
-		echo "done"
-	else
-		echo "MD5 sum error, please download and unpack svn2cl to dir $ADMIN_DIR/svn2cl manually..."
-		exit 1;
-	fi
-	rm $SVN2CL_FILE_DL
-	rm -f web
-	rm -f ${SVN2CL_FILE_DL}.md5
-}
-
 # This function downloads 7zip and unpacks it, if the MD5 sum of the downloaded
 # package is correct
 function get_7zExtra {
@@ -124,10 +93,16 @@ else
 fi
 
 
-if [ -x "$SVN_TO_CHANGELOG" ]; then
-	echo "svn2cl found, OK."
+if [ ! -x "$PYTHON_ENV/bin/activate" ]; then
+	python -m venv ${PYTHON_ENV}
+fi
+. ${PYTHON_ENV}/bin/activate
+
+
+if [ -x "$GIT_TO_CHANGELOG" ]; then
+	echo "git-changelog found, OK."
 else
-	get_svn2cl
+	pip install git-changelog
 fi
 
 BIN_7Z=`which 7z`
@@ -209,16 +184,10 @@ else
 	echo "Done"
 fi
 
-## create or update unix_install directory
-if [ -d "$TRED_UNIXINST_DIR" ]; then
-	cd $TRED_UNIXINST_DIR
-	echo "Updating unix_install checkout directory"
-	svn up >> $LOG
-	echo "Done"
-else
-	echo "No directory unix_install found, creating a new one and making a fresh checkout"
-	mkdir $TRED_UNIXINST_DIR 2>/dev/null
-	svn co $TRED_SVN_REPO/devel/unix_install $TRED_UNIXINST_DIR >> $LOG
-	echo "Done"
-fi
-
+## create unix_install directory
+echo "remove and create unix_install checkout directory"
+rm -rf "$TRED_UNIXINST_DIR"
+git -C ${TRED_SRC_DIR}/devel/unix_install archive --output $TRED_UNIXINST_DIR.zip  HEAD >> $LOG
+unzip ${TRED_UNIXINST_DIR}.zip -d  ${TRED_UNIXINST_DIR}  >> $LOG && \
+rm ${TRED_UNIXINST_DIR}.zip && \
+echo "Done"

admin/release-deb.sh

@@ -6,15 +6,15 @@
 EXTDIR=`dirname $(readlink -fen $0)`
 . $EXTDIR/env.sh
 
-SVN_VERSION=`svn info . | grep 'Revision:' | sed -E 's/[^0-9]+//g'`
+GIT_DATE=`git log -1 --date=format:"%Y%m%d" --format="%ad"|tr -d "\n"`
 
 # Prepare the deb package
 cd "$PROJECT_DIR/unix_install_pkgs/deb" || exit 1
 ./prepare_deb_pkg.sh || exit 2
 
 # Copying the package to the local www
 echo "Copying the package to local www ..."
-DEB_FILE="tred_2.${SVN_VERSION}_all.deb"
+DEB_FILE="tred_3.${GIT_DATE}_all.deb"
 cp "./${DEB_FILE}" "${TREDWWW}/tred/${DEB_FILE}"
 d=`pwd`
 cd "${TREDWWW}/tred/"
@@ -29,7 +29,7 @@ ssh ${LOGIN_NAME}@${TESTING_SERVER} "rm -f /var/www/tred/testbed/*.deb"
 
 # Upload the package to the testbed website
 echo "Uploading the package to testbed web ..."
-DEB_FILE="tred_2.${SVN_VERSION}_all.deb"
+DEB_FILE="tred_3.${GIT_DATE}_all.deb"
 scp "./${DEB_FILE}" "${LOGIN_NAME}@${REMOTE_WWW}/${DEB_FILE}"
 
 # Make sure tred.deb link points to the newest deb package

admin/release-rpm.sh

@@ -6,7 +6,7 @@
 EXTDIR=`dirname $(readlink -fen $0)`
 . $EXTDIR/env.sh
 
-SVN_VERSION=`svn info . | grep 'Revision:' | sed -E 's/[^0-9]+//g'`
+GIT_DATE=`git log -1 --date=format:"%Y%m%d" --format="%ad"|tr -d "\n"`
 
 # Prepare the deb package
 cd "$PROJECT_DIR/unix_install_pkgs/rpm" || exit 1
@@ -24,7 +24,7 @@ for DISTRO in $DISTROS; do
 	echo "... for $DISTRO ..."
 	d=`pwd`
 	cd "${TREDWWW}/tred/"
-	ln -sfr "tred-2-${SVN_VERSION}-${DISTRO}.noarch.rpm" "tred-${DISTRO}.rpm"
+	ln -sfr "tred-3-${GIT_DATE}-${DISTRO}.noarch.rpm" "tred-${DISTRO}.rpm"
 	cd $d
 done
 
@@ -46,7 +46,7 @@ echo "Creating symlinks for rpm packages ..."
 DISTROS=`ls -1 ./tred*.rpm | sed -E 's/^.*tred-[0-9]+-[0-9]+-//' | sed 's/[.]noarch[.]rpm$//' | tr "\\n" " "`
 for DISTRO in $DISTROS; do
 	echo "... for $DISTRO ..."
-	ssh ${LOGIN_NAME}@${TESTING_SERVER} "cd /var/www/tred/testbed && ln -sf ./tred-2-${SVN_VERSION}-${DISTRO}.noarch.rpm ./tred-${DISTRO}.rpm"
+	ssh ${LOGIN_NAME}@${TESTING_SERVER} "cd /var/www/tred/testbed && ln -sf ./tred-3-${GIT_DATE}-${DISTRO}.noarch.rpm ./tred-${DISTRO}.rpm"
 done
 
 cd "$EXTDIR"