[Ohrrpgce] SVN: teeemcee/7703 email_save_to_developer, only works on Android. Requires 770bfd5 of sdl-

[James Paige]

On Mon, Feb 1, 2016 at 11:20 PM, Ralph Versteegen <teeemcee at gmail.com>
wrote:

> First, do "git remote -v" in the git repo to find out what name you've
> assigned to my repository. It will probably be "origin" if you cloned my
> repository in the first place. Then do "git pull <remotename> ohrrpgce" to
> fetch my changes and merge into yours (actually fast forward in this case
> where there seems to be nothing to merge).
>

Okay. I cloned from yours to my own github account, and the cloned my local
copy from there (and apparently I manually added pelya's later)

james at ghostorchid:~/src/misc/sdl-android$ git remote -v
origin    https://github.com/bob-the-hamster/commandergenius.git (fetch)
origin    https://github.com/bob-the-hamster/commandergenius.git (push)
pelya    https://github.com/pelya/commandergenius.git (fetch)
pelya    https://github.com/pelya/commandergenius.git (push)
upstream    git://github.com/rversteegen/commandergenius.git (fetch)
upstream    git://github.com/rversteegen/commandergenius.git (push)

I can also see that your changes exist on your ohrrpgce but not your
sdl_android branch

In my own tree, I do all important edits on the sdl_android branch. My
ohrrpgce branch is very strictly limited to only the following chages:

* replaced splash screen
* replaced default button images
* removed non-ohrrpgce projects

So I think that means for my purposes I want to do:

  git checkout sdl_android
  git pull upstream ohrrpgce
  git checkout ohrrpgce
  git merge sdl_android

...wish me luck!

...and crap.

It looks like your ohrrpgce branch is based on my ohrrpgce branch, with the
splash and button images replaced, and all thenon-ohrrpgce projects removed.

That means that:

  git checkout sdl_android
  git pull upstream ohrrpgce

And now I have a horribly mangled local sdl_android branch... I need to
figure out how to undo that :(

(after a bit of mucking about, I *think* that "git reset --hard e22ba68"
did the trick... I think...)


BTW, in git you would normally delete a branch after merging it into
> another (git branch -d <name>), otherwise you end up with mountains of
> historical branches as you have. So the name of the branch only gets
> recorded (by default) in the commit message for the merge commit. On the
> other hand in hg every commit permanently records the name of the branches
> it was part of. The hg equivalent of a branch in git is actually called a
> bookmark.
>

Why is it good to delete branches? How is having a lot of old historical
ones a problem?


> However, it looks like I'll have to make futher changes to the java code.
>

For now I'll just test the Android debug=0 thing using svn revision 7702

---
James


>
>
> On 2 February 2016 at 04:19, James Paige <Bob at hamsterrepublic.com> wrote:
>
>> I was going to test the fixes to the battle stack on Android, but I can
>> no longer compile the android port. I assume this is because "Requires
>> 770bfd5 of sdl-android" but I only just barely understand what that means.
>>
>> I am guessing that 770bfd5 identifies a commit in your git tree for
>> sdl-android.
>>
>> I searched around on your guthub page and found it here:
>> https://github.com/rversteegen/commandergenius/commits/ohrrpgce
>>
>> ...Although I have no idea how to merge it into my own tree
>>
>> /home/james/misc/android-ndk-r8d/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86/bin/../lib/gcc/arm-linux-androideabi/4.6/../../../../arm-linux-androideabi/bin/ld:
>> warning: hidden symbol '__cxa_begin_cleanup' in
>> ./obj/local/armeabi/libgnustl_static.a(eh_arm.o) is referenced by DSO
>> ./obj/local/armeabi/libsdl-1.2.so
>> /home/james/misc/android-ndk-r8d/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86/bin/../lib/gcc/arm-linux-androideabi/4.6/../../../../arm-linux-androideabi/bin/ld:
>> warning: hidden symbol '__cxa_type_match' in
>> ./obj/local/armeabi/libgnustl_static.a(eh_arm.o) is referenced by DSO
>> ./obj/local/armeabi/libsdl-1.2.so
>> /home/james/misc/android-ndk-r8d/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86/bin/../lib/gcc/arm-linux-androideabi/4.6/../../../../arm-linux-androideabi/bin/ld:
>> ./obj/local/armeabi/objs-debug/application/ohrrpgce/tmp/game-allmodex.o: in
>> function
>> EMAIL_FILES:jni/../jni/application/ohrrpgce/tmp/game-allmodex.c:12918:
>> error: undefined reference to 'SDL_ANDROID_EmailFiles'
>> collect2: ld returned 1 exit status
>> make: *** [obj/local/armeabi/libapplication.so] Error 1
>>
>>
>>
>>
>> On Mon, Feb 1, 2016 at 4:35 AM, <subversion at hamsterrepublic.com> wrote:
>>
>>> teeemcee
>>> 2016-02-01 04:35:06 -0800 (Mon, 01 Feb 2016)
>>> 455
>>> email_save_to_developer, only works on Android. Requires 770bfd5 of
>>> sdl-android
>>>
>>> This emails an rsav file and g_debug.txt. Not sure it actually works; it
>>> worked
>>> until I modified the java function to accept more than one file, and
>>> then gmail
>>> started crashing and the usb link to my phone stopped working.
>>>
>>> Added an option to the F8 debug menu to email the save, but of course
>>> you can't
>>> press F8 on a phone, and the option doesn't appear on other platforms.
>>> ---
>>> U   wip/allmodex.bas
>>> U   wip/allmodex.bi
>>> U   wip/game.bas
>>> U   wip/game.bi
>>> U   wip/gglobals.bi
>>> U   wip/savegame.rbas
>>> U   wip/testgame/autotest.rpg
>>> _______________________________________________
>>> Ohrrpgce mailing list
>>> ohrrpgce at lists.motherhamster.org
>>> http://lists.motherhamster.org/listinfo.cgi/ohrrpgce-motherhamster.org
>>>
>>
>>
>> _______________________________________________
>> Ohrrpgce mailing list
>> ohrrpgce at lists.motherhamster.org
>> http://lists.motherhamster.org/listinfo.cgi/ohrrpgce-motherhamster.org
>>
>>
>
> _______________________________________________
> Ohrrpgce mailing list
> ohrrpgce at lists.motherhamster.org
> http://lists.motherhamster.org/listinfo.cgi/ohrrpgce-motherhamster.org
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.motherhamster.org/pipermail/ohrrpgce-motherhamster.org/attachments/20160202/cdf27f74/attachment-0001.htm>