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.

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

Work done by dawlane for CX #126

Merged
merged 26 commits into from
Apr 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
0e040bd
Removed unneeded files.
dawlane Feb 14, 2023
959b6f6
Updated gitignore for new file types.
dawlane Feb 15, 2023
ac5acf0
Updated to Ted work from Qt5 to Qt6.2.
dawlane Feb 15, 2023
f246528
New build and install instructions.
dawlane Feb 15, 2023
0af904b
New config txt files with more details for setup.
dawlane Feb 15, 2023
bc60657
Added new builder scripts and icons.
dawlane Feb 15, 2023
feb3213
Improvements to bracket highlighting.
dawlane Feb 19, 2023
0cbd946
Merge branch 'cerberusxdev:develop' into experimental_buildscripts_ted
dawlane Feb 23, 2023
112045b
Added keys to support retina displays.
dawlane Mar 11, 2023
dffbd21
Merge branch 'cerberusxdev:develop' into experimental_buildscripts_ted
dawlane Mar 25, 2023
52bc938
Merge branch 'cerberusxdev:develop' into experimental_buildscripts_ted
dawlane Apr 8, 2023
da22892
Minor fixes check inkscape, function names.
dawlane Apr 10, 2023
f25f788
Added new C++Tool configs.
dawlane Apr 11, 2023
2d6cbaa
Fixed TARGET_OS_IPHONE warning.
dawlane Apr 11, 2023
062e495
Updated building instructions.
dawlane Apr 11, 2023
58abb2a
Updates for Qt 6.5.0 and minor fixes.
dawlane Apr 11, 2023
f1935d5
Revised winnt launcher projects.
dawlane Apr 12, 2023
79e5a2c
Revised C++Tool targe template.
dawlane Apr 12, 2023
df8212b
Added start of tests for transcc to run in debug.
dawlane Apr 12, 2023
da2433e
Updated the stb_image files for newer versions.
dawlane Apr 12, 2023
32d98ee
Changes to C++Tool to use project files.
dawlane Apr 12, 2023
f76d56e
Modified builder script for changes.
dawlane Apr 12, 2023
d1c7158
Update to Linux install and setup instructions.
dawlane Apr 12, 2023
f69144d
Merge branch 'cerberusxdev:develop' into experimental_cpptool_mod
dawlane Apr 13, 2023
b60e66f
Minor update to docs.
dawlane Apr 16, 2023
cc99ae3
Minor updates and fixes to builder scripts.
dawlane Apr 16, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,16 @@
!/bin/internal
!/bin/external
!/bin/macdeploy*.command
/mingw*
/MinGW*
/tdm*
/TDM*


.bmx
.DS_Store
._.DS_Store
._*
*.buildv*
*.bak
desktop.ini
Expand Down Expand Up @@ -40,3 +46,10 @@ Thumbs.db
/src/transcc/transcc.build/cpptool/main_winnt.exe
/src/transcc/transcc.build/cpptool/main_linux
/src/transcc/transcc.build/cpptool/main_macos

/src/builders/images/svg/*.svg
/src/builders/bash/temp/*

.vscode
*.code-workspace
*.desktop
Binary file removed Logo.png
Binary file not shown.
9 changes: 0 additions & 9 deletions Ted.desktop

This file was deleted.

116 changes: 94 additions & 22 deletions bin/config.linux.txt
Original file line number Diff line number Diff line change
@@ -1,55 +1,127 @@

'--------------------
'Cerberus modules path
' IMPORTANT: DO NOT USE FILE PATHS THAT CONTAIN SPACES!
' System and Cerberus root environment variables can be passed using the macro : ${THE_VAR_TO_USE}
' On Linux, the only system environment variable of any use is the HOME system environment variable.
' Others can be added to the end of the hidden files .profile or .bashrc. See the Linux distributions documentation or forums on this subject.
'
'Can be overriden via transcc cmd line
' For the average Linux user. All applications not part of the Linux distributions repositories
' should be placed in the users home directory. Files and folders can be relocated elsewhere, but requires that
' the user has administrator rights, knows how to set groups and file permissions, and if using an external source;
' knows how how to mount those external sources, be they a local drive or samba if working over a MS Windows network.
'
' It can also be useful to use symbolic links to these locations created in the users home directory to point to the target folders or files if
' the drive where the users home folder is limited for space.
' For example, assuming that 'devdrive' is pre-mounted, set with the correct file access mount options, group and file permissions:
' ln -s /mnt/devdrive/Android/Sdk $HOME/Android/Sdk
'
' Linux distributions will have a number of options on managing different versions of a Java Development Kit and compilers that can live side-by-side.
' Most distributions may already have these developer tools pre-installed, but many will not and will have to be manually installed and require
' administrator privileges to do so.
'
' Some distributions do have installed graphical package managers. These can be pretty limited, but an alternatives can be installed. Search for details on the distributions
' forums for more information.
'--------------------

'--------------------
' Cerberus modules path
'
' Can be overridden. See the Cerberus X documentation on the transcc command line tool
'

MODPATH="${CERBERUSDIR}/modules;${CERBERUSDIR}/modules_ext"
'--------------------

'--------------------
'HTML player path.
' HTML player path.
'
'Must be set for HTML5 target support.
' Must be set for HTML5 target support.
'
' The cserver is used to provide a mini web server for opening .html files...
'

HTML_PLAYER="${CERBERUSDIR}/bin/cserver_linux"
'--------------------

'--------------------
'Java dev kit path
' Java dev kit path (JDK)
'
' Must be set to a valid directory for ANDROID and FLASH target support
'
' Normally a JDK would be installed via the Linux distribution's package manager, but a different version can be downloaded and extracted
' and used. You should update the JDK_PATH configuration variable to the path of the JDK that is to be used.
'
' If using Android Studio, It is possible that the install will have a much newer version of a JDK, but
' it could be incompatible with the current release of Cerberus X. If that's the case, then a different JDK must be installed.
'
' Alternative to the repository JDK's can be found from:
' Oracle JDK, found here: https://www.oracle.com/java/technologies/downloads/
' OpenJDK. You can see which vendors offer this from https://en.wikipedia.org/wiki/OpenJDK
' NOTE: The wiki only links to the vendors main websites, so a search for OpenJDK on their sites will be needed.
'
'Must be set to a valid dir for ANDROID and FLASH target support
' NOTE: Some JDK installations use a combined JDK/JRE, so make sure that the path chosen has the Java compiler (javac)
' within the bin subfolder.
'
'The Java JDK is currently available here:
' http://www.oracle.com/technetwork/java/javase/downloads/index.html
' If Android Studio is to be used, then the default location depends on where the Application is to installed.
' Normally this would be the user's home directory under 'android-studio, so default JDK_PATH should be
' set to use the embedded JDK found in the Android Studio installation location.
' $HOME/android-studio/jre
'
JDK_PATH="${HOME}/jdk1.8.0_31"
JDK_PATH="${HOME}/jdk1.7.0_09"

JDK_PATH="${HOME}/android-studio/jre"
'--------------------

'--------------------
'Flex SDK and flash player path.
'
'FLEX_PATH Must be set for FLASH target support.
' Android SDK and tool paths.
'
FLEX_PATH="${HOME}/flex_sdk_4.6"
' Must be set to a valid directory for ANDROID target support
'
' If using Android Studio, the default location for the installation of the Android SDK is in $HOME/Android/Sdk
' To confirm that this is where the Android Sdk is installed, start Android Studio and locate the SDK Manager. See the Android Studio documentation on how to do this.
' It will show the location of where the current Android SDK is and if it's different, then the ANDROID_PATH configuration variable should be updated to this path.
' NOTE: For the Android SDK to work successfully, it must be located in a folder that does not require elevated privileges.
'
'for opening .swf files...cerberus will use HTML_PLAYER if this is not set.
'FLASH_PLAYER="...?..."

ANDROID_PATH="${HOME}/Android/Sdk"
'--------------------

'--------------------
'Android SDK and tool paths.
' Android NDK
'
'Must be set to a valid for for ANDROID target support.
' Must be set to a valid dir for ANDROID NDK target support
'
ANDROID_PATH="${HOME}/android-sdk-linux"
' The Android NDK tools are not currently used, but is here if it should be used in the future.
' Android Studio installs NDK's by version number. The are downloaded via Android SDK tools and
' are located in a subfolder called ndk located in the Android SDK folder.

ANDROID_NDK_PATH="${HOME}/Android/Sdk/ndk/23.0.7599858"
'--------------------

'--------------------
'Android NDK
' Depreciated Targets
' These targets are no longer supported and are commented out. They are only here for reference.
'
' Apache ANT is the main build system for Flash and at one point for Android.
' On Linux distributions, it's usually installed via the distributions package manager and it's often
' used by other application.
'
' The Flex SDK is the software development kit for Flash enabled web applications.
' It's still available from https://flex.apache.org/
' With the advance of HTML5, Flash is seldom used any more and Flash player and it's web browser plugin reached it's
' End of Life on December 31 2020.
' You can still download the flash player debugger from https://www.adobe.com/support/flashplayer/debug_downloads.html
'
'--------------------
' Flex SDK and flash player path.
'
'Must be set to a valid dir for ANDROID NDK target support
' FLEX_PATH Must be set for FLASH target support.
'
ANDROID_NDK_PATH="${HOME}/android-ndk-r9"
' Either HTML_PLAYER or FLASH_PLAYER must be set for FLASH target support.
' Flex is current supported by the Apache Foundation and is currently here https://flex.apache.org/index.html
'
' Set the FLASH_PLAYER to the location of the Flash Player plugin
' for opening .swf files...cerberus will use HTML_PLAYER if this is not set.
'FLEX_PATH="c:\flex_sdk_4.6"
'FLASH_PLAYER="...?..."
'--------------------

108 changes: 80 additions & 28 deletions bin/config.macos.txt
Original file line number Diff line number Diff line change
@@ -1,71 +1,123 @@
'--------------------
' IMPORTANT: DO NOT USE FILE PATHS THAT CONTAIN SPACES!
' System and Cerberus root environment variables can be passed using the macro : ${THE_VAR_TO_USE}
' On Mac OS, the only system environment variable of any use is the HOME system environment variable.
' Others can be added to the end of the hidden files relevant to the default shell that Mac OS uses e.g .profile or .bashrc.
' See the relevant documentation for shell config files or search forums on this subject.
'
' On Mac OS. Applications can be installed either as an application bundle (.app), or as a package (.pkg) and by third-party tools like home-brew and macports.
' The user has administrator rights to do some setup and know how to set groups and file permissions, and if using an external sources; must
' knows how how to mount those external sources, be they a local drive or samba if working over a MS Windows network.
'
' It can also be useful to use symbolic links to these locations created in the users home directory, to point to the target folders or files if
' the drive where the users home folder is limited for space.
' For example, assuming that 'devdrive' is pre-mounted, set with the correct file access mount options, group and file permissions:
' ln -s /mnt/devdrive/Android/Sdk $HOME/Android/Sdk
'
'--------------------

'--------------------
'Cerberus modules path
' Cerberus modules path
'
'Can be overriden via transcc cmd line
' Can be overridden. See the Cerberus X documentation on the transcc command line tool
'

MODPATH="${CERBERUSDIR}/modules;${CERBERUSDIR}/modules_ext"
'--------------------

'--------------------
'Cerberus targets path
'
'Can be overriden via transcc cmd line
'Can be overriden. See the Cerberus X documentation on the transcc command line tool
'
TARGETPATH="${CERBERUSDIR}/targets;${CERBERUSDIR}/targets_ext;D:\CerberusX\CerberusTargets"
'--------------------

'--------------------
'HTML player path.
' HTML player path.
'
'Must be set for HTML5 target support.
' Must be set for HTML5 target support.
'
' The cserver is used to provide a mini web server for opening .html files...
'

HTML_PLAYER=open -n "${CERBERUSDIR}/bin/cserver_macos.app" --args
'--------------------

'--------------------
'Ant build tool path
' Java dev kit path (JDK)
'
'Must be set to a valid dir for ANDROID target support on Mavericks ('coz Mavericks no longer includes Ant).
' Must be set to a valid directory for ANDROID and FLASH target support
'
'Ant is currently available here:
' http://ant.apache.org/bindownload.cgi
' If using Android Studio, It is possible that the install will have a much newer version of a JDK, but
' it could be incompatible with the current release of Cerberus X. If that's the case, then a different JDK must be installed.
'
ANT_PATH="${HOME}/apache-ant-1.9.7"
'--------------------

'--------------------
'Flex SDK and flash player path.
' Alternative to the repository JDK's can be found from:
' Oracle JDK, found here: https://www.oracle.com/java/technologies/downloads/
' OpenJDK. You can see which vendors offer this from https://en.wikipedia.org/wiki/OpenJDK
' NOTE: The wiki only links to the vendors main websites, so a search for OpenJDK on their sites will be needed.
'
'Must be set for FLASH target support.
' NOTE: Some JDK installations use a combined JDK/JRE, so make sure that the path chosen has the Java compiler (javac)
' within the bin subfolder.
'
FLEX_PATH="${HOME}/flex_sdk_4.6"
' If Android Studio is to be used, then the default location depends on where the Application is to installed.
' Normally on Mac OS, this would be the Applications folder, so default JDK_PATH should be set to use the embedded JDK found
' in the Android Studio installation location.
' /Applications/Android Studio.app/Contents/jre/Contents/Home
'
'for opening .swf files...cerberus will use HTML_PLAYER if this is not set.
'FLASH_PLAYER="...?..."

JDK_PATH="/Applications/Android Studio.app/Contents/jre/Contents/Home"
'--------------------

'--------------------
'Android SDK and tool paths.
' Android SDK and tool paths.
'
'Must be set to a valid for for ANDROID target support
' Must be set to a valid directory for ANDROID target support
'
' If using Android Studio, the default location for the installation of the Android SDK is in $HOME/Library/Android/sdk
' To confirm that this is where the Android Sdk is installed, start Android Studio and locate the SDK Manager. See the Android Studio documentation on how to do this.
' It will show the location of where the current Android SDK is and if it's different, then the ANDROID_PATH configuration variable should be updated to this path.
' NOTE: For the Android SDK to work successfully, it must be located in a folder that does not require elevated privileges.
'
'Android SDK

'This is where new android studio puts sdk on my macos machine...
ANDROID_PATH="${HOME}/Library/Android/sdk"
'--------------------

'Old sdk..
ANDROID_PATH="${HOME}/android-sdk-macosx"
'--------------------
' Android NDK
'
' Must be set to a valid dir for ANDROID NDK target support
'
' The Android NDK tools are not currently used, but is here if it should be used in the future.
' Android Studio installs NDK's by version number. The are downloaded via Android SDK tools and
' are located in a subfolder called ndk located in the Android SDK folder.

JDK_PATH="/Applications/Android Studio.app/Contents/jre/Contents/Home"
ANDROID_NDK_PATH="${HOME}/Library/Android/sdk/ndk/23.0.7599858"
'--------------------

'--------------------
'Android NDK
' Depreciated Targets
' These targets are no longer supported and are commented out. They are only here for reference.
'
' Apache ANT is the main build system for Flash and at one point for Android.
'
'Must be set to a valid dir for ANDROID NDK target support
' The Flex SDK is the software development kit for Flash enabled web applications.
' It's still available from https://flex.apache.org/
' With the advance of HTML5, Flash is seldom used any more and Flash player and it's web browser plugin reached it's
' End of Life on December 31 2020.
' You can still download the flash player debugger from https://www.adobe.com/support/flashplayer/debug_downloads.html
'
ANDROID_NDK_PATH="${HOME}/android-ndk-r9"
'--------------------
' Flex SDK and flash player path.
'
' FLEX_PATH Must be set for FLASH target support.
'
' Either HTML_PLAYER or FLASH_PLAYER must be set for FLASH target support.
' Flex is current supported by the Apache Foundation and is currently here https://flex.apache.org/index.html
'
' Set the FLASH_PLAYER to the location of the Flash Player plugin
' for opening .swf files...cerberus will use HTML_PLAYER if this is not set.
'FLEX_PATH="c:\flex_sdk_4.6"
'FLASH_PLAYER="...?..."
'--------------------

Loading