Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS will be completely phased out by mid-2025. To see alternatives please check here

Skip to content
Snippets Groups Projects
Commit ba5a2068 authored by Kostis ANAGNOSTOPOULOS's avatar Kostis ANAGNOSTOPOULOS
Browse files

auxmerge: Improve 'Release Files' vbproj importing. 

+ Use "Link" to import files outside VECTO/VECTO.vbproj.
+ Now warning just as original-ricardo.
parent 6a1d148a
No related branches found
Tags milestones/2.0.4-beta-AUX.Alpha.3
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Tools/AuxMerge/README.md
+ 7
− 7
View file @ ba5a2068
......@@ -4,12 +4,12 @@
The merging of VECTO-AUX <--> VECTO-Core has happenned in these stages:
1. Identify fork-point in VECTO-code's history
(see `git-rewrite.sh`):
1. Identify fork-point in VECTO-code's history
(see `git-rewrite.sh`):
milistone/2.0.4-beta
milestone/2.0.4-beta
2. FIXUP VECT-AUX sources to be similar to the above VECTO-core sources
2. FIXUP VECT-AUX sources to be similar to the above VECTO-core sources
(see `git-rewrite.sh`).
......@@ -21,11 +21,11 @@ The merging of VECTO-AUX <--> VECTO-Core has happenned in these stages:
5. Append these tools into sources.
6. NEXT steps:
6. NEXT steps:
- Await Ricardo's fixes (TCs failing, aux-model discrepancy).
- Merge with later milestones, till latest 2.2.
- The `del*.sh` files are utilities for other remotes,
to delete refs now abandoned (not complete).
......
Tools/AuxMerge/rebase_aux.sh
+ 70
− 47
View file @ ba5a2068
......@@ -6,7 +6,7 @@ git checkout milestones/2.0.4-beta -- VECTO/GUI/{F_VEH_AuxDlog.vb,F_VEH_AuxDlog.
#### Manual merge .sln & .vbproj. ####
git commit -m 'Merge Ricardo initial-VECTO-core with forked point `milestones/2.0.4-beta`.
git commit -m 'Merge Ricardo initial-VECTO-core with forked point `milestones/2.0.4-beta`.
+ All conflicts replaced with `2/0/4-beta`,
apart from .sln & .vbproj.
......@@ -32,10 +32,10 @@ git checkout b7a8675fe271c29e -- User\ Manual/GUI/{ENG-Editor.html,GBX-Editor.ht
## Conflicts on 35f1fa6564b1 "DOCS DONE":
# Just added modified files
## VETO.vbproj & MORE(!) conflicts on 4b779d2323ece680 "Schematics V11, vsum output fix":
## VETO.vbproj & MORE(!) conflicts on 4b779d2323ece680 "Schematics V11, vsum output fix":
# Glenn added 'VECTO/Release Files/*'
# ABORT REBASE to rewrite rest commits properly distributing 'VECTO/Release Files/'
git tag tag auxmerge/aux_fixup-added_ReleaseFiles 4b779d2323ece6806470c8e -m "orig-msg: Schematics V11, vsum output fix - Zarb, Glenn
git tag auxmerge/aux_fixup-added_ReleaseFiles 4b779d2323ece6806470c8e -m "orig-msg: Schematics V11, vsum output fix - Zarb, Glenn
Glen Imported 'VECTO/Release Files/', replicating manual and generic Vehicles
NOTE: VS fails, with 27 missing pdfstamper libs, etc
......@@ -44,81 +44,104 @@ git cherry-pick auxmerge/aux_fixup-added_ReleaseFiles
function move_to_root_ReleaseFiles() {
rsync -ma VECTO/Release\ Files/ .
git rm -rf VECTO/Release\ Files
rm ./User Manual/pics/Thumbs.db
git add 'User Manual' 'Generic Vehicles'
rm -f './User Manual/pics/Thumbs.db'
git add 'User Manual' 'Generic Vehicles' 'Declaration'
## Convert
# <None Include="Release Files\User Manual\Release Notes.pdf" />
###
# <None Include="..\User Manual\Release Notes.pdf">
# <Link>Release Files\Release Notes.pdf</Link>
# </None>
sed -i 's_<\(\w\+\)\s\+Include="\(Release Files\\\([^"]\+\)\)"\s*/>_<\1 Include="..\\\3" >\n <Link>\2</Link>\n </\1>_' VECTO/VECTO.vbproj
patch VECTO/VECTO.vbproj << EOF ## FAILS!!! Do it manually
--- a/VECTO/VECTO.vbproj
+++ b/VECTO/VECTO.vbproj
@@ -765,9 +765,6 @@
@@ -765,9 +765,5 @@
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.VisualBasic.targets" />
<PropertyGroup>
- <PostBuildEvent>XCOPY "$(ProjectDir)Release Files" "$(TargetDir)" /Y /E</PostBuildEvent>
+ <PostBuildEvent>XCOPY "$(ProjectDir)\..\Generic Vehicles" "$(TargetDir)" /Y /E</PostBuildEvent>
+ <PostBuildEvent>XCOPY "$(ProjectDir)\..\User Manual" "$(TargetDir)" /Y /E</PostBuildEvent>
+ <PostBuildEvent>XCOPY "$(SolutionDir)User Manual" "$(SolutionDir)Generic Vehicles" "$(TargetDir)" /Y /E</PostBuildEvent>
</PropertyGroup>
EOF
sed -i 's/Release Files\\/..\\/' VECTO/VECTO.vbproj
git add VECTO/VECTO.vbproj
}
git commit -m 'JRC-rewrite: Schematics V11, vsum output fix - Zarb, Glenn
move_to_root_ReleaseFiles
git commit -m "JRC: Re-root Ric's 'Release Files', update VECTO.vbproj."
git cherry-pick 4b779d2323ece6806470..auxmerge/aux-fixup
## CONFLICT DECLARATION FILES on 4f494692f4cac435b "git-tfs-id: [http://tfs00.element.root.com:8080/tfs/TFSCollection]$/VECTO;C2019"
#
move_to_root_ReleaseFiles
git commit -m "JRC: Add RICARDO Declaration files.
- sed-ed conflicting VECTO.vbproj.
- Orig-commit-message:
git-tfs-id: [http://tfs00.element.root.com:8080/tfs/TFSCollection]$/VECTO;C2019
"
Move all `VECTO/Release Files` to root, and resolve conflict in `VECTO/VECTO.vbproj`.
'
git cherry-pick 4f494692f4cac435b970497b..auxmerge/aux-fixup
## EMPTY COMMIT on bf441b7 "Add referenced file"
# SKIP IT, `itextsharp.dll` already there!
git reset && git cherry-pick --continue
## SKIP almost empty e7d7b7dd5dbddc4d"Remove TFS bindings"
# Bindings havebeen removed during "fixup" rewrite - this commits contains
# Bindings have been removed during "fixup" rewrite - this commits contains
# just a space after `global` in VECTO.sln.
## MISSING FILE IN a6ec62ecdc98f9 "Remove 12t Delivery Truck from \Generic Vehicles\Engineering Mode as per Nik's email."
#
#
move_to_root_ReleaseFiles ## AND manually merge .gitignore.
git commit -m 'JRC-reqrite: Remove 12t Delivery Truck from \Generic Vehicles\Engineering Mode as per Nik's email.
git add
git commit -m "JRC-rewrite: Remove 12t Delivery Truck from \Generic Vehicles\Engineering Mode as per Nik's email.
Move all `VECTO/Release Files` to root, and resolve conflict in `VECTO/VECTO.vbproj`.
Move all 'VECTO/Release Files' to root, and resolve conflict in 'VECTO/VECTO.vbproj'.
REST MSG: Remove 12t Delivery Truck from \Generic Vehicles\Engineering Mode as per Nik's email.
Replace User Manual folder with one the from Q driver as per Nik's email.
Added files to Developer Guide as per Nik's email.
'
"
## finished!
## COMPARE WITH LATER MILESONES
## COMPARE WITH LATER MILESTONES
# to see which one looks close to rebased AUX-sources.
#
# Run output of next cmd manually.
git tag -l | grep '/2' | xargs -n1 -I XXX echo git diff auxmerge/jrc-merge_tug3-ok_BeforeReleaseFiles XXX \| wc
git diff auxmerge/jrc-merge_tug3-ok_BeforeReleaseFiles milestones/2.0.1-beta0 | wc
1034241 3210452 42918389
git diff auxmerge/jrc-merge_tug3-ok_BeforeReleaseFiles milestones/2.0.1-beta1 | wc
1034238 3210511 42919218
git diff auxmerge/jrc-merge_tug3-ok_BeforeReleaseFiles milestones/2.0.3-beta0 | wc
1033716 3209932 42894253
git diff auxmerge/jrc-merge_tug3-ok_BeforeReleaseFiles milestones/2.0.4-beta | wc
1033766 3210095 42895849
git diff auxmerge/jrc-merge_tug3-ok_BeforeReleaseFiles milestones/2.0.4-beta1 | wc
1033853 3210421 42898237
git diff auxmerge/jrc-merge_tug3-ok_BeforeReleaseFiles milestones/2.0.4-beta2 | wc
1033879 3210581 42899277
git diff auxmerge/jrc-merge_tug3-ok_BeforeReleaseFiles milestones/2.0.4-beta3 | wc
1034039 3211275 42905464
git diff auxmerge/jrc-merge_tug3-ok_BeforeReleaseFiles milestones/2.0.4-beta4_Test | wc
1034054 3211400 42906211
git diff auxmerge/jrc-merge_tug3-ok_BeforeReleaseFiles milestones/2.1 | wc
1128574 3307768 45464517
git diff auxmerge/jrc-merge_tug3-ok_BeforeReleaseFiles milestones/2.1.1 | wc
1128908 3308727 45470878
git diff auxmerge/jrc-merge_tug3-ok_BeforeReleaseFiles milestones/2.1.2 | wc
1128948 3308371 45463333
git diff auxmerge/jrc-merge_tug3-ok_BeforeReleaseFiles milestones/2.1.3 | wc
1129453 3310111 45466143
git diff auxmerge/jrc-merge_tug3-ok_BeforeReleaseFiles milestones/2.1.4 | wc
1129473 3310203 45466678
git diff auxmerge/jrc-merge_tug3-ok_BeforeReleaseFiles milestones/2.2 | wc
1130178 3312744 45465377
\ No newline at end of file
## auxmerge/jrc-rebase_on_tug-2.0.4-beta@(6a1d148a2aef020d)
$ git diff auxmerge/jrc-rebase_on_tug-2.0.4-beta milestones/2.0.1-beta0 | wc
1035928 3216401 42980069
$ git diff auxmerge/jrc-rebase_on_tug-2.0.4-beta milestones/2.0.1-beta1 | wc
1035925 3216460 42980898
$ git diff auxmerge/jrc-rebase_on_tug-2.0.4-beta milestones/2.0.3-beta0 | wc
1035403 3215881 42955933
$ git diff auxmerge/jrc-rebase_on_tug-2.0.4-beta milestones/2.0.4-beta | wc
1035453 3216044 42957529
$ git diff auxmerge/jrc-rebase_on_tug-2.0.4-beta milestones/2.0.4-beta1 | wc
1035540 3216370 42959917
$ git diff auxmerge/jrc-rebase_on_tug-2.0.4-beta milestones/2.0.4-beta2 | wc
1035566 3216530 42960957
$ git diff auxmerge/jrc-rebase_on_tug-2.0.4-beta milestones/2.0.4-beta3 | wc
1035726 3217224 42967144
$ git diff auxmerge/jrc-rebase_on_tug-2.0.4-beta milestones/2.0.4-beta4_Test | wc
1035741 3217349 42967891
$ git diff auxmerge/jrc-rebase_on_tug-2.0.4-beta milestones/2.1 | wc
1130261 3313717 45526197
$ git diff auxmerge/jrc-rebase_on_tug-2.0.4-beta milestones/2.1.1 | wc
1130595 3314676 45532558
$ git diff auxmerge/jrc-rebase_on_tug-2.0.4-beta milestones/2.1.2 | wc
1130635 3314320 45525013
$ git diff auxmerge/jrc-rebase_on_tug-2.0.4-beta milestones/2.1.3 | wc
1131140 3316060 45527823
$ git diff auxmerge/jrc-rebase_on_tug-2.0.4-beta milestones/2.1.4 | wc
1131160 3316152 45528358
$ git diff auxmerge/jrc-rebase_on_tug-2.0.4-beta milestones/2.2 | wc
1131865 3318693 45527057
(winpy34)
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about