Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Version 3.32-02 candidate #998

Merged
merged 39 commits into from
Oct 12, 2021
Merged

Version 3.32-02 candidate #998

merged 39 commits into from
Oct 12, 2021

Conversation

codemanyak
Copy link
Collaborator

Enhancements

Bugfixes

Important: Please rebuild the Structorizer.exe wrapper for Windows to be delivered in the zip download (for Windows and Linux) with the newest version of Launch4J (3.14) and the updated configuration windows_wrapper.xml here in the project. It will overcome the hassle reported in #988.

ale and others added 30 commits March 25, 2021 21:05
ARM Translator
b74e6e1
ARM Translator
f2e7368
ARM Translator
4a5b177
ARM Translator
26c9d58
ARM Translator
2f8d9fa
ARM Translator
6568328
@codemanyak
Merge pull request #968 from asimonetta/issue967
bfbaa46 
ARM Translator
@codemanyak
Code revision are enh. #967 adoption, comments damaged by code reform…
dec5a8f 
…atting restored.
@codemanyak
Issue combination #738 / #967: code map mended in ARMGenerator, Strin…
e5f375b 
…gList method renamed
@codemanyak
Merge branch 'bugfix' (#966, #969) into issue967
0627df9 
Solved conflicts:
- src/lu/fisch/structorizer/gui/Diagram.java
- src/lu/fisch/structorizer/gui/changelog.txt
@codemanyak
KEIL/GNU choice for #967 (ARM code export) moved from Diagram menu to…
88f11cd 
… export options
@codemanyak
Cleanup after ARM export option
9ffea1b
@codemanyak
Gnu icon (129) renamed
6fbe769
@codemanyak
Gnu icon 16 px replaced
8c01f62
ARM Translator
c0ae452
@codemanyak
Merge remote-tracking branch 'remotes/asimonetta/issue967' into issue967
8efd5fb 
Solved conflicts in src/lu/fisch/structorizer/generators/ArmGenerator.java
@codemanyak
A. Simonetta's #967 fixes corrected.
7c866e6
@codemanyak
More corrections to #967 (ARM generator) contribution
9b5effd
@codemanyak
Issue #967: Several flaws in ArmGenerator.java fixed (EXITs, MUL, CALLs)
c5b0639
@codemanyak
Some minor fixes to ArmGenerator.java (#967)
c4f5462
@codemanyak
Merge branch 'bugfix' (version 3.31-03) into issue967
59b62ce 
(Solved conflicts in src/lu/fisch/structorizer/gui/changelog.txt)
@codemanyak
Merge branch 'bugfix' (3.32-01) into issue967
e72ff87 
Resolved conflicts:
- buildapp.xml
- src/lu/fisch/structorizer/elements/Element.java
- src/lu/fisch/structorizer/gui/Diagram.java
- src/lu/fisch/structorizer/gui/Menu.java
- src/lu/fisch/structorizer/gui/changelog.txt
- src/lu/fisch/structorizer/gui/generators.xml
@codemanyak
Revision of the ArmGenerator condition handling
162ed3c
@codemanyak
Merge branch 'bugfix' into issue967
4177a60 
Resolved conflicts:
- src/lu/fisch/structorizer/elements/Jump.java
- src/lu/fisch/structorizer/generators/Generator.java
- src/lu/fisch/structorizer/gui/changelog.txt
@codemanyak
Enh. #967: Arm export now skips type definitions and mere declarations.
40dbf93
@codemanyak
Re-fixes a merging loss in Diagram.exportOptions()
a2754bb
@codemanyak
Merging artefacts in Diagram.java mended.
4072bc4
@codemanyak
Merge branch 'bugfix' (with bugfix #995) into issue967
d1bc45f
@codemanyak
Merge branch 'bugfix' into issue967
cf57371
@codemanyak
Manpage adapted
7129429
@fesch fesch merged commit 5fdf469 into master Oct 12, 2021
@fesch
Copy link
Owner

fesch commented Oct 12, 2021

Compiling does no longer copy dependent libs ... so everything is broken. I need to fix my build-script ...

@fesch
Copy link
Owner

fesch commented Oct 12, 2021

Okay, seams to work for now at least on Windows.
Can't test OSX until later this afternoon ...

@codemanyak
Copy link
Collaborator Author

I think I see where the problem was: Two configuration changes by Alessandro Simonetta in the private.* files of the netbeans configuration slipped through unnoticed, because I don't use netbeans. I am really sorry. This prevented the copying of the build.xml and bildapp.xml and modified lib path references...

@codemanyak
Copy link
Collaborator Author

Also have a look to the .gitignore file and the project.properties. It might e.g. be wrong and dangerous that the /dist path was added to .gitignore - at least if it contains your distribution code.

@fesch
Copy link
Owner

fesch commented Oct 12, 2021

The dist folder only contains the files generated by NetBeans. My files reside in some other secret place ;-)

@codemanyak
Copy link
Collaborator Author

My files reside in some other secret place

A wise decision, obviously 😁

@codemanyak codemanyak deleted the issue967 branch October 12, 2021 08:49
codemanyak added a commit to codemanyak/Structorizer.Desktop that referenced this pull request Oct 12, 2021
@codemanyak
Prepared for bugfixing towards version 3.32-03
c23a9be 
Some unwanted changes in the private netbeans configuration as inadvertently merged in with pull request fesch#998 reverted.
@codemanyak codemanyak mentioned this pull request Nov 2, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@codemanyak @fesch