recent make_tr.py change

[Sebastian Kuzminsky]

Hello Christian, on March 21 you pushed commit eb59f49c to the develop
branch, and it undoes a couple of commits that I had made recently
(c0e8c0f3 and b10c912d, both minor fixes to make_tr.py).

Your commit also changes the paths to pylupdate5.exe and lrelease.exe on
Windows, which is a part of make_tr.py that I had not messed with.

Did you mean to revert my changes, or was that an accident of git?

Would you mind if i put my changes back in?


--
Sebastian Kuzminsky

[Christian Kohlöffel]

Hi Sebastian,

 

this was an accident of git, or to say it better: I am not very firm with Git. I thought i did make it correct. If you are able, can you just revert my changes i did on March 21 and replace it with your last Version. That would be the easiest way i think.

 

Sorry for that

 

Christian

--

--

You received this message because you subscribed to the Google

Groups-group  "dxf2gcode-dev".

To post a message, send mail to dxf2gc...@googlegroups.com

To unsubscribe, send mail to dxf2gcode-de...@googlegroups.com

See http://groups.google.de/group/dxf2gcode-dev?hl=en for more options

and the dxf2gcode project page at http://code.google.com/p/dxf2gcode/

---

You received this message because you are subscribed to the Google Groups "dxf2gcode-dev" group.

To unsubscribe from this group and stop receiving emails from it, send an email to dxf2gcode-de...@googlegroups.com.

For more options, visit https://groups.google.com/d/optout.

 

[Sebastian Kuzminsky]

On 03/27/2018 01:04 PM, 'Christian Kohlöffel' via dxf2gcode-dev wrote:
> this was an accident of git, or to say it better: I am not very firm
> with Git. I thought i did make it correct. If you are able, can you just
> revert my changes i did on March 21 and replace it with your last
> Version. That would be the easiest way i think.
>
> Sorry for that

No problem! There's a *lot* to learn about git before it becomes easy
to use...

I just pushed a new commit (75be5b00) to the develop branch, this commit
restores the two changes I'd made to make_tr.py while leaving (I
believe) the changes you intended to make to make_tr.py.

The make_tr.py diff from where I left things to the tip of develop is
now this, which I think matches your intention:

> diff --git a/source/make_tr.py b/source/make_tr.py
> index 2cf0fea..3a2c3b3 100755
> --- a/source/make_tr.py
> +++ b/source/make_tr.py
> @@ -56,9 +56,9 @@ if "linux" in sys.platform.lower() or "unix" in sys.platform.lower() or "darwin"
> else:
> PYTHONPATH = os.path.split(sys.executable)[0]
> # To get pylupdate5.exe use: pip3.exe install PyQt5
> - PYLPATH = os.path.join(PYTHONPATH, "Lib/site-packages/PyQt5/pylupdate5.exe")
> + PYLPATH = os.path.join(PYTHONPATH, "Scripts/pylupdate5.exe")
> # To get lrelease.exe use: pip3.exe install pyqt5-tools
> - LREPATH = os.path.join(PYTHONPATH, "Lib/site-packages/pyqt5/lrelease.exe")
> + LREPATH = os.path.join(PYTHONPATH, "Lib/site-packages/pyqt5-tools/lrelease.exe")
> print("Using Windows platform tools \"%s\" and \"%s\"\n" % (PYLPATH, LREPATH))
>
> FILEPATH = os.path.realpath(os.path.dirname(sys.argv[0]))
> @@ -105,11 +105,11 @@ if len(sys.argv) >= 2 and sys.argv[1] == '--no-pylupdate':
> else:
> cmd1 = ("%s %s %s %s\n" % (PYLPATH, FILESSTR, OPTIONS, TSFILESTR))
> print(cmd1)
> - print(subprocess.call(cmd1, shell=True))
> + subprocess.check_call(cmd1, shell=True)
>
> cmd2 = ("%s %s\n" % (LREPATH, TSFILESTR))
> print(cmd2)
> -print(subprocess.call(cmd2, shell=True))
> +subprocess.check_call(cmd2, shell=True)


So i think all the changes you wanted, and all the changes i wanted, are
all in develop now. :-)


--
Sebastian Kuzminsky