Investigation of current branches of this project.

denisfa commented 5 years ago

I will keep some logs and comments about each branch, as well as the dates of deletion. Started on 01/09/2019 (first of september, 2019).

git push origin :refs/heads/BRANCH_NAME to delete BRANCH_NAME.

[x] agbprint - only a few lines of not-working code related to #269 (deleted 16/09/2019)
[ ] arthur/PNaCl
[X] arthur/dsound - already implemented on sdl port (deleted 25/09/2019)
[X] arthur/gles - OpenGL ES support for SDL port, but initial work is incomplete. It is better to start from zero rather than continuing here (deleted 26/09/2019)
[ ] arthur/master
[X] arthur/opengl-ifdef - already implemented on sdl port. (deleted on 16/09/2019)
[X] arthur/sdl2 - dealt with #508. (deleted on 26/09/2019)
[ ] arthur/sergiobenrocha2-master
[ ] arthur/svn-master
[ ] arthur/svn_adamn-link
[ ] arthur/svn_bgk-link
[X] arthur/wxV3 - nothing useful regarding the current code. (deleted on 10/09/2019)
[X] debian-update - changes merged into master right after creation. (deleted on 04/09/2019)
[x] linux-static-build - merged changes with some other refactoring (deleted 12/09/2019)
[X] no-debugger - meant to fix issue 431. (deleted on 04/09/2019)
[x] osx-32bit - already merged, deleted
[X] utf8-logger - already merged. Follow up work will be on another branch. (deleted on 10/09/2019)
[X] vbam-rr - nothing relevant to this project anymore. (deleted on 06/09/2019)

ZachBacon commented 5 years ago

I think the linux-static-build should stay as I think @rkitover still has some plans for that. I'm not 100% on that yet.

denisfa commented 5 years ago

@ZachBacon No issues, this is mostly an investigation. If it is indeed valid work, I will try to merge it, just like other branch dedicated to a specific issue.

ZachBacon commented 5 years ago

@denisfa I think @rkitover would prefer not to merge that in just yet, WIP stuff and all.

ZachBacon commented 5 years ago

outright though I think the arthur branches for SDL2 and wxv3 probably could be removed since we either already migrated on our own to SDL2 and his changes are primarily unfinished work there.

denisfa commented 5 years ago

@ZachBacon Sorry, I meant finish whatever WIPs are there and then make a PR. I did this to xbrz1.6 (updated to newer version etc) and some other.

ZachBacon commented 5 years ago

I understand, but I'm saying @rkitover's linux-static branch is more of a personal project I think that uses his build script, and the other two branches I mentioned we tackled on and technically completed in master.

denisfa commented 5 years ago

@ZachBacon Ok, I will take a look and check these.

rkitover commented 5 years ago

deleted osx-32bit as that was already merged

rkitover commented 5 years ago

Merged and deleted linux-static-build.

rkitover commented 5 years ago

Deleted agbprint.

rkitover commented 5 years ago

@denisfa thanks for spearheading this effort, all of our branches have been cleaned up now.

The only thing left is to look at the arthur branches and see if there is any useful code there.

denisfa commented 5 years ago

@rkitover @ZachBacon What are these tags:

Beta-3 # THIS ONE
Keyboardfixes # THIS ONE
VBA-M_Beta_2 # THIS ONE
c7c6ad6 # THIS ONE
throttle # THIS ONE
v2.0.0
v2.0.1
v2.0.2
v2.1.0
v2.1.1
v2.1.2
v2.1.3
waylandplus # THIS ONE

Could we create a task to remove some of these too? I know they only tag commits, but is there a reason for all of them to be there?

ZachBacon commented 5 years ago

Old test releases before we started doing them differently, Keep them up I think for now, But I'll leave that call to @rkitover

rkitover commented 5 years ago

The tag code in cmake ignores these, so they do no harm. You can delete them if you want though.

rkitover commented 5 years ago

@denisfa We can rewrite those tags as version numbers with the strings as the tag messages, sound good? I can do that.

denisfa commented 5 years ago

We can rewrite those tags as version numbers with the strings as the tag messages, sound good? I can do that.

@rkitover Yes, please. They are just weird to look at. There is the continuous versioning and the others. When I saw those, it felt like Keyboardfixes, c7c6ad6, waylandplus and throttle were leftovers from something from the past (like checking a solution for an issue). Meanwhile, VBA-M_Beta_2 and Beta-3 could be v1.X.X or something like that.

Also, what happened to the SVN repos? Are they lost forever? It would be really nice if we could check previous code, especially for some of the link issues.

rkitover commented 5 years ago

@ZachBacon would know more about the svn repos, may be what was on the sourceforge project here:

https://sourceforge.net/projects/vbam/

ZachBacon commented 5 years ago

those in the svn repo should of been imported as branches here on git when I did the migration.

denisfa commented 5 years ago

@rkitover @ZachBacon The branch arthur/PNaCl was supposed to be make the SDL port run as a web app, but its main lib has been deprecated by google (sources 1 and 2). There is an alternative called webassembly, and also a migration plan.

Do you think it is worth to go after this? The current branch does not compile, since it is incomplete and it uses a very old version of the PNaCl lib. Personally, I think it could be a good learning experience, but I would have to start from 0. For now, I will keep this branch since that is the main part of all this.

One thing to notice is that all these branches (gles, dsound, PNaCl, sdl2, opengl-ifdef) were all fragmented work to prepare the SDL port to run both web and the binary we run today. None of them were completed (dsound for example was never started, but there were commits fixing other stuff that were also commited to the current SDL code, same as gles and sdl2).

With that said, the arthur/master was the origin of all these. So we can delete it after we are done here.

denisfa commented 5 years ago

@ZachBacon Check this. What does

git-svn-id: https://svn.code.sf.net/p/vbam/code/branches/bgk-link@1230 a31d4220-a93d-0410-bf67-fe4944624d44

mean? Is this recoverable?

ZachBacon commented 5 years ago

That's autogenerated from when I pulled the svn repo into github.

ZachBacon commented 5 years ago

As for the pncl stuff and the gles, dsound, sdl2 etc they weren't completed works, Most of his efforts went into the frame stuff and making frames accessible from all frontends at the time.

rkitover commented 5 years ago

@denisfa Here you go, a bit of revisionist history, nice and clean:

git tag -l --sort='*authordate' --format='%(refname:short)   %(contents:subject)   %(*authordate:short)   %(*objectname:short)'
v1.9.4   v1.9.4   2015-09-19   abe2c0f2
v1.9.5   v1.9.5   2016-08-09   1eb76857
v1.9.6   v1.9.6   2016-12-14   f7f67ff6
v1.9.7   v1.9.7   2017-02-02   6ecab805
v1.9.8   v1.9.8   2017-02-22   931fda45
v1.9.9   v1.9.9   2017-03-14   2e8bee11
v2.0.1   v2.0.1   2017-10-10   55fa9c69
v2.0.2   v2.0.2   2018-03-13   92ba6766
v2.1.0   v2.1.0   2018-06-30   7aa5d939
v2.1.1   v2.1.1   2019-02-25   b5741ee4
v2.1.2   v2.1.2   2019-04-06   95433f6c
v2.1.3   v2.1.3   2019-04-17   1401573f

denisfa commented 5 years ago

@rkitover This is amazing! Thank you!

visualboyadvance-m / visualboyadvance-m

Investigation of current branches of this project. #497