Giter Site home page Giter Site logo

Comments (23)

spoofy-zz avatar spoofy-zz commented on September 17, 2024 1

So, it seems that problem is because it exist directory "macos" named same as the branch (macos).
Maybe branch renaming leads to less confusion.
Than this issue can be closed.

from pw3270.

wrljet avatar wrljet commented on September 17, 2024 1

Yes, I have verified develop branch does work!

One small issue, though, on Apple silicon...

The autogen.sh scripts in the lib3270 and libv3270 have some code to figure out if glibtoolize should be used instead of libtoolize.

That needs to be added to the main pw3270 project autogen.sh as well.

Bill

from pw3270.

wrljet avatar wrljet commented on September 17, 2024 1

Tested that change. Build process all working well, now, on macOS Apple silicon.

The Hercules emulator community really likes your 3270.
Thanks!

from pw3270.

andrebreves avatar andrebreves commented on September 17, 2024 1

What is the correct git command to checkout a branch who's name conflicts with a directory?

Depending on your version of git client, you can use the git switch command to switch branches. This command was created to address this kind of situations where a branch has the same name of a file.

from pw3270.

PerryWerneck avatar PerryWerneck commented on September 17, 2024

Are you using the macos branch?

from pw3270.

spoofy-zz avatar spoofy-zz commented on September 17, 2024

Are you using the macos branch?

Yes

from pw3270.

wrljet avatar wrljet commented on September 17, 2024

Are you using the macos branch?

I see the same issue now myself.

This linker problem comes up during make, (before the bundle in the macos directory).

It works if I checkout commit d83869d that I was using before, when we last went through this.

Bill

from pw3270.

PerryWerneck avatar PerryWerneck commented on September 17, 2024

The pw3270_build_data_path() function is in the source, but, since the github action for macos os is failing (again) and I dont have a maco the check it I cant debug this issue.

from pw3270.

wrljet avatar wrljet commented on September 17, 2024

Perry,

I found the problem. Quite simple. I want to do another full dry run to make sure before I post it here.

Bill

from pw3270.

wrljet avatar wrljet commented on September 17, 2024

Somewhere / somehow between commit d83869d and current, the src/main/macos directory (and its tools.c) has disappeared.

Unfortunately I don't know how to drive git well enough to figure out where/when/how this happened.

Bill

from pw3270.

PerryWerneck avatar PerryWerneck commented on September 17, 2024

That's odd! I just checked in the github web (https://github.com/PerryWerneck/pw3270/tree/macos/src/main/macos) and the source seens ok. I just checked and it's available on develop and macos branches. It's missing only in the master branch but this is expected since they're was not merged (yet).

Just for curiosity: Whats the output of the 'git branch' command in you machine?

from pw3270.

wrljet avatar wrljet commented on September 17, 2024

You can see from the below, it's just gone from the current HEAD or macos branch.

bill@Bills-Mac-mini junk % git clone https://github.com/PerryWerneck/pw3270.git
Cloning into 'pw3270'...
remote: Enumerating objects: 25600, done.
remote: Counting objects: 100% (2609/2609), done.
remote: Compressing objects: 100% (888/888), done.
remote: Total 25600 (delta 1734), reused 2544 (delta 1685), pack-reused 22991
Receiving objects: 100% (25600/25600), 5.26 MiB | 10.48 MiB/s, done.
Resolving deltas: 100% (18804/18804), done.

bill@Bills-Mac-mini junk % cd pw3270 
bill@Bills-Mac-mini pw3270 % git branch
* master

bill@Bills-Mac-mini pw3270 % find . -name tools.c
./src/objects/window/tools.c
./src/objects/actions/tools.c
./src/main/tools.c
./src/main/linux/tools.c
./src/main/windows/tools.c

bill@Bills-Mac-mini pw3270 % git checkout -b macos
Switched to a new branch 'macos'

bill@Bills-Mac-mini pw3270 % find . -name tools.c 
./src/objects/window/tools.c
./src/objects/actions/tools.c
./src/main/tools.c
./src/main/linux/tools.c
./src/main/windows/tools.c

bill@Bills-Mac-mini pw3270 % 

from pw3270.

wrljet avatar wrljet commented on September 17, 2024

And, yes, it is odd! :)

from pw3270.

PerryWerneck avatar PerryWerneck commented on September 17, 2024

You are using a clone of the master branch named macos, not the real branch from github. That's why the code isn't updated.

From your message:

bill@Bills-Mac-mini pw3270 % git branch
* master

Then, later, you create a new branch...

bill@Bills-Mac-mini pw3270 % git checkout **-b** macos
Switched to a NEW BRANCH 'macos'

To switch to the macos branch from github you should use....

git checkout macos
git pull

from pw3270.

wrljet avatar wrljet commented on September 17, 2024

git checkout macos gives an error msg.

Like I mentioned before, I don't get git. And very much dislike it.

from pw3270.

PerryWerneck avatar PerryWerneck commented on September 17, 2024

git checkout macos gives an error msg.

What error? Did you restarted with a clean folder? I think the checkout/pull/fetch will fail since you created your own macos branch.

from pw3270.

wrljet avatar wrljet commented on September 17, 2024

Just BTW, I'm only involved in this at all to help out fellow Hercules IBM mainframe friends...

OK, so...

bill@Bills-Mac tools % git clone https://github.com/PerryWerneck/pw3270.git ./pw3270
Cloning into './pw3270'...
remote: Enumerating objects: 25600, done.
remote: Counting objects: 100% (2609/2609), done.
remote: Compressing objects: 100% (888/888), done.
remote: Total 25600 (delta 1734), reused 2544 (delta 1685), pack-reused 22991
Receiving objects: 100% (25600/25600), 5.26 MiB | 10.66 MiB/s, done.
Resolving deltas: 100% (18804/18804), done.
bill@Bills-Mac tools % 
bill@Bills-Mac tools % 
bill@Bills-Mac tools % cd pw3270   
bill@Bills-Mac pw3270 % 
bill@Bills-Mac pw3270 % git checkout macos
fatal: 'macos' could be both a local file and a tracking branch.
Please use -- (and optionally --no-guess) to disambiguate
bill@Bills-Mac pw3270 % 

from pw3270.

PerryWerneck avatar PerryWerneck commented on September 17, 2024

Try 'git checkout develop' it's the same source now.

from pw3270.

wrljet avatar wrljet commented on September 17, 2024

What is the correct git command to checkout a branch who's name conflicts with a directory?

from pw3270.

PerryWerneck avatar PerryWerneck commented on September 17, 2024

So, it seems that problem is because it exist directory "macos" named same as the branch (macos). Maybe branch renaming leads to less confusion. Than this issue can be closed.

For now I'll remove the macos branch; it was merged to develop.

from pw3270.

PerryWerneck avatar PerryWerneck commented on September 17, 2024

What is the correct git command to checkout a branch who's name conflicts with a directory?

git checkout develop should work.

from pw3270.

PerryWerneck avatar PerryWerneck commented on September 17, 2024

Closing as build process is now working well.

from pw3270.

wrljet avatar wrljet commented on September 17, 2024

Thank you for that tip. And thank you for your other invaluable contributions.

from pw3270.

Related Issues (20)

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. 📊📈🎉

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google ❤️ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.