-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
SVN to GIT #5
base: main
Are you sure you want to change the base?
SVN to GIT #5
Changes from 4 commits
804dd57
aa60ed6
486180a
490a9bb
d37101b
4ea449e
27441e9
1ee67d4
674667d
93ddd87
1e9d524
6abbe40
a4514b7
dd621bc
9496fa2
6ba44e0
30cded4
2f3bfe8
4620b87
ff103fc
8fddd1c
d09986d
aa238f3
f9fb6f4
2102913
02256c4
8aa7057
dcc5c56
4659f4b
a3fb8b8
bc41af8
4ba7cbd
b72aad7
5bdba74
79df812
afdd3f4
69217a3
42e89c0
c124607
3e8736a
ca163de
47ecc1e
396db70
ef5a4c1
9c267e8
493ace2
ff83555
961b979
28491c4
4493e6c
2d6ea52
9581aa8
74e21c5
cba5c9f
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
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 |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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)))) | ||
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=$GIT_DIR/make_log | ||
|
||
TRED_HOME_URL="http://ufallab.ms.mff.cuni.cz:24080/tred/testbed" | ||
TRED_EXTENSIONS_URL="" | ||
|
@@ -68,6 +69,10 @@ 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 | ||
|
||
[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 | ||
|
@@ -91,6 +96,8 @@ 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 | ||
|
||
|
@@ -104,4 +111,4 @@ CHANGELOG_TO_RSS=${ADMIN_DIR}/changelog2rss.pl | |
[email protected] | ||
MAC_TRED_INSTALLATION='~/tred_installation' | ||
MAC_TRED_INSTALLATION_OLD='~/tred_installation_old' | ||
MAC_SVN_DIR='~/TrEd' | ||
MAC_GIT_DIR='~/TrEd' |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,14 +12,17 @@ if [ -e ${TRED_DIST_DIR}.new ]; then | |
exit 1; | ||
fi && \ | ||
|
||
echo "Exporting svn" && \ | ||
svn export ${TRED_SVN_REPO} ${TRED_DIST_DIR}.new >> $LOG && \ | ||
echo "Exporting git" && \ | ||
##svn export ${TRED_SVN_REPO} ${TRED_DIST_DIR}.new >> $LOG && \ | ||
git -C ${TRED_SRC_DIR} archive --output ${TRED_DIST_DIR}.new.zip HEAD >> $LOG && \ | ||
unzip ${TRED_DIST_DIR}.new.zip -d ${TRED_DIST_DIR}.new >> $LOG && \ | ||
# updates TrEd version in dist/tred.new/tredlib/TrEd/Version.pm according to svn version to 1.#svn_version# | ||
${TRED_DIST_DIR}.new/devel/update_version.pl ${TRED_SVN_REPO} && \ | ||
|
||
echo "Updating extensions" && \ | ||
echo "WARN: Skipping updating extensions" && \ | ||
#echo "Updating extensions" && \ | ||
# perform pre-updates, update svn, then some post-updates for extension (currently only for tmt) according to extension/.make.d directory | ||
${TRED_EXT_DIR}/update && \ | ||
#${TRED_EXT_DIR}/update && \ | ||
Comment on lines
+23
to
+26
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. What does skipping the update mean? |
||
|
||
cp ${TRED_SRC_DIR}/ChangeLog ${TRED_DIST_DIR}.new/ && \ | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,7 +6,7 @@ | |
# should do the trick | ||
|
||
EXTDIR=`dirname $(readlink -fen $0)` | ||
SVN_DIR=$(dirname $(dirname $(dirname $(dirname $(readlink -fen $0))))) | ||
GIT_DIR=$(dirname $(dirname $(dirname $(readlink -fen $0)))) | ||
. "$EXTDIR/../../admin/env.sh" | ||
|
||
echo "Patching Graph::Kruskal" && \ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. In the long run, we should switch to CPAN::Distroprefs (those who can see UFAL internal svn, see MED#446). |
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -34,14 +34,10 @@ | |
my $version_file = File::Spec->rel2abs('../tredlib/TrEd/Version.pm',$rb); | ||
|
||
die "Did not find $version_file!" if !-f $version_file; | ||
# You'd better pass an arg to set this or this may fail in the future | ||
my $REPO = shift || 'https://svn.ms.mff.cuni.cz/svn/TrEd_refactored/tred_refactored/'; | ||
|
||
my $svn_version = `svn info "$REPO" |grep "^Revision:" |cut -f2 -d:`; | ||
my $updated_version = sprintf("%04d", $svn_version); | ||
my $VER = '2.' . $updated_version; | ||
chomp $VER; | ||
$VER=~s/\s+//g; | ||
|
||
my $git_date = `git log -1 --date=format:"\%Y\%m\%d" --format="%ad"`; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Backslashes not needed. |
||
chomp $git_date; | ||
my $VER = '3.' . $git_date; | ||
|
||
print $VER,"\n" unless $opts{'quiet'}; | ||
print STDERR "TrEd::Version: $version_file\n" if $opts{debug}; | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fix the comments, too.
s/SVN/git/