Skip to content

Commit

Permalink
Update for SU2019 - Ruby 2.5
Browse files Browse the repository at this point in the history
  • Loading branch information
thomthom authored Feb 5, 2019
2 parents 98d2b05 + f4c7169 commit b98f827
Show file tree
Hide file tree
Showing 815 changed files with 2,869 additions and 190,237 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0820"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "33CC241018D57AB80079FC3E"
BuildableName = "SURubyDebugger.dylib"
BlueprintName = "SURubyDebugger"
ReferencedContainer = "container:SURubyDebugger.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "33CC241018D57AB80079FC3E"
BuildableName = "SURubyDebugger.dylib"
BlueprintName = "SURubyDebugger"
ReferencedContainer = "container:SURubyDebugger.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "33CC241018D57AB80079FC3E"
BuildableName = "SURubyDebugger.dylib"
BlueprintName = "SURubyDebugger"
ReferencedContainer = "container:SURubyDebugger.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
4 changes: 2 additions & 2 deletions DebugServer/DebugServer.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ call $(SolutionDir)postbuild.bat
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>$(SolutionDir)../ThirdParty/lib/Debug/x64</AdditionalLibraryDirectories>
<AdditionalDependencies>libboost_system-vc140-mt-sgd-1_62.lib;x64-msvcrt-ruby220.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>libboost_system-vc140-mt-sgd-1_62.lib;x64-msvcrt-ruby250.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>set TARGETDIR=$(TargetDir)
Expand Down Expand Up @@ -170,7 +170,7 @@ call $(SolutionDir)postbuild.bat
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>$(SolutionDir)../ThirdParty/lib/Release/x64</AdditionalLibraryDirectories>
<AdditionalDependencies>libboost_system-vc140-mt-s-1_62.lib;x64-msvcrt-ruby220.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>libboost_system-vc140-mt-s-1_62.lib;x64-msvcrt-ruby250.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>set TARGETDIR=$(TargetDir)
Expand Down
Binary file modified DebugServer/Resource.aps
Binary file not shown.
Binary file modified DebugServer/Resource.rc
Binary file not shown.
20 changes: 20 additions & 0 deletions Development.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Development

## Building

### Mac

cd Build
xcodebuild -scheme SURubyDebugger -configuration Release

### Windows

TODO:

## Releasing

1. Update binary versions. (VS Resource Editor)
2. Build binaries for each platform.
3. Tag commit it was built from.
4. Upload binaries to GitHub Releases.
5. Update README.md to refer to new download URL and versions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2014 Trimble Navigation Ltd.
Copyright (c) 2014-2019 Trimble Inc.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@ SketchUp Ruby API Debugger

This is a Ruby debugger framework for SketchUp 2014 and later. The `ruby-debug-ide` protocol has been mostly implemented so any Ruby IDE that supports this protocol should work.

| IDE | Stable (1.0.3.0) | Stable (1.1.0.0) |
| IDE | Stable (1.0.3.0) | Stable (1.1.0.0) | Stable (1.2.0.0) |
| --- | --- | --- |
| [Aptana RadRails](https://github.com/SketchUp/sketchup-ruby-debugger/wiki/How-to-set-up-an-IDE-for-debugging-Ruby-extensions-in-SketchUp) | Good | *Untested* |
| NetBeans (with Ruby community plugin) | Good | *Untested* |
| [RubyMine](https://github.com/SketchUp/sketchup-ruby-api-tutorials/wiki/RubyMine-Debugger-Setup) | Good | Good |
| [VS Code](https://github.com/SketchUp/sketchup-ruby-api-tutorials/wiki/VSCode-Debugger-Setup) (with `vscode-ruby` extension) | Not supported | Good |
| [Aptana RadRails](https://github.com/SketchUp/sketchup-ruby-debugger/wiki/How-to-set-up-an-IDE-for-debugging-Ruby-extensions-in-SketchUp) | Good | *Untested* | *Untested* |
| NetBeans (with Ruby community plugin) | Good | *Untested* | *Untested* |
| [RubyMine](https://github.com/SketchUp/sketchup-ruby-api-tutorials/wiki/RubyMine-Debugger-Setup) | Good | Good | Good |
| [VS Code](https://github.com/SketchUp/sketchup-ruby-api-tutorials/wiki/VSCode-Debugger-Setup) (with `vscode-ruby` extension) | Not supported | Good | Good |

## Instructions for Windows:
- Download the pre-built dynamic library (SURubyDebugger.dll) from the [latest release](https://github.com/SketchUp/sketchup-ruby-debugger/releases) or build from the sources.
- Copy the DLL into the SketchUp installation directory. As the exact path will depend on the version of SketchUp you have installed, look for a folder similar to the following:
```
C:\Program Files\SketchUp\SketchUp 2018\
C:\Program Files\SketchUp\SketchUp 2019\
C:\Program Files (x86)\SketchUp\SketchUp 2015\
```
Expand All @@ -27,11 +27,11 @@ SketchUp.exe -rdebug "ide port=7000"
- Install SketchUp 2014 Maintenance 1 Release (version 14.1.1283) or later.
- Download `SURubyDebugger.dylib` into the Frameworks directory of the app bundle:
```
curl -L https://github.com/SketchUp/sketchup-ruby-debugger/releases/download/1.1.0.0/SURubyDebugger.dylib -o /Applications/SketchUp\ 2018/SketchUp.app/Contents/Frameworks/SURubyDebugger.dylib
curl -L https://github.com/SketchUp/sketchup-ruby-debugger/releases/download/1.2.0.0/SURubyDebugger.dylib -o /Applications/SketchUp\ 2019/SketchUp.app/Contents/Frameworks/SURubyDebugger.dylib
```
- Run SketchUp from the command line:
```
open -a /Applications/SketchUp\ 2018/SketchUp.app --args -rdebug "ide port=7000"
open -a /Applications/SketchUp\ 2019/SketchUp.app --args -rdebug "ide port=7000"
```

## Command-line arguments:
Expand Down
72 changes: 72 additions & 0 deletions ThirdParty/include/ruby/win32_x64/ruby/backward.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
#ifndef RUBY_RUBY_BACKWARD_H
#define RUBY_RUBY_BACKWARD_H 1

#define RClass RClassDeprecated
#ifndef __cplusplus
DEPRECATED_TYPE(("RClass is internal use only"),
struct RClass {
struct RBasic basic;
});
#endif

#define DECLARE_DEPRECATED_FEATURE(ver, func) \
NORETURN(ERRORFUNC(("deprecated since "#ver), DEPRECATED(void func(void))))

/* complex.c */
DECLARE_DEPRECATED_FEATURE(2.2, rb_complex_set_real);
DECLARE_DEPRECATED_FEATURE(2.2, rb_complex_set_imag);

/* eval.c */
DECLARE_DEPRECATED_FEATURE(2.2, rb_disable_super);
DECLARE_DEPRECATED_FEATURE(2.2, rb_enable_super);

/* hash.c */
DECLARE_DEPRECATED_FEATURE(2.2, rb_hash_iter_lev);
DECLARE_DEPRECATED_FEATURE(2.2, rb_hash_ifnone);

/* string.c */
DECLARE_DEPRECATED_FEATURE(2.2, rb_str_associate);
DECLARE_DEPRECATED_FEATURE(2.2, rb_str_associated);

/* variable.c */
DEPRECATED(void rb_autoload(VALUE, ID, const char*));

/* vm.c */
DECLARE_DEPRECATED_FEATURE(2.2, rb_clear_cache);
DECLARE_DEPRECATED_FEATURE(2.2, rb_frame_pop);

#define DECLARE_DEPRECATED_INTERNAL_FEATURE(func) \
NORETURN(ERRORFUNC(("deprecated internal function"), DEPRECATED(void func(void))))

/* error.c */
DECLARE_DEPRECATED_INTERNAL_FEATURE(rb_compile_error);
DECLARE_DEPRECATED_INTERNAL_FEATURE(rb_compile_error_with_enc);
DECLARE_DEPRECATED_INTERNAL_FEATURE(rb_compile_error_append);

/* struct.c */
DECLARE_DEPRECATED_INTERNAL_FEATURE(rb_struct_ptr);

/* variable.c */
DECLARE_DEPRECATED_INTERNAL_FEATURE(rb_generic_ivar_table);

/* vm.c */
DEPRECATED(int rb_frame_method_id_and_class(ID *idp, VALUE *klassp));

/* from version.c */
#ifndef RUBY_SHOW_COPYRIGHT_TO_DIE
# define RUBY_SHOW_COPYRIGHT_TO_DIE 1
#endif
#if RUBY_SHOW_COPYRIGHT_TO_DIE
/* for source code backward compatibility */
DEPRECATED(static inline int ruby_show_copyright_to_die(int));
static inline int
ruby_show_copyright_to_die(int exitcode)
{
ruby_show_copyright();
return exitcode;
}
#define ruby_show_copyright() /* defer EXIT_SUCCESS */ \
(exit(ruby_show_copyright_to_die(EXIT_SUCCESS)))
#endif

#endif /* RUBY_RUBY_BACKWARD_H */
2 changes: 1 addition & 1 deletion ThirdParty/include/ruby/win32_x64/ruby/backward/classext.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#if defined __GNUC__
#warning use of RClass internals is deprecated
#elif defined _MSC_VER || defined __BORLANDC__
#elif defined _MSC_VER
#pragma message("warning: use of RClass internals is deprecated")
#endif

Expand Down
2 changes: 1 addition & 1 deletion ThirdParty/include/ruby/win32_x64/ruby/backward/rubyio.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#if defined __GNUC__
#warning use "ruby/io.h" instead of "rubyio.h"
#elif defined _MSC_VER || defined __BORLANDC__
#elif defined _MSC_VER
#pragma message("warning: use \"ruby/io.h\" instead of \"rubyio.h\"")
#endif
#include "ruby/io.h"
6 changes: 3 additions & 3 deletions ThirdParty/include/ruby/win32_x64/ruby/backward/rubysig.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
rubysig.h -
$Author: akr $
$Date: 2014-02-15 00:16:31 +0900 (Sat, 15 Feb 2014) $
$Author: kosaki $
$Date: 2015-10-18 11:10:34 +0900 (Sun, 18 Oct 2015) $
created at: Wed Aug 16 01:15:38 JST 1995
Copyright (C) 1993-2008 Yukihiro Matsumoto
Expand All @@ -12,7 +12,7 @@

#if defined __GNUC__
#warning rubysig.h is obsolete
#elif defined _MSC_VER || defined __BORLANDC__
#elif defined _MSC_VER
#pragma message("warning: rubysig.h is obsolete")
#endif

Expand Down
2 changes: 1 addition & 1 deletion ThirdParty/include/ruby/win32_x64/ruby/backward/st.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#if defined __GNUC__
#warning use "ruby/st.h" instead of bare "st.h"
#elif defined _MSC_VER || defined __BORLANDC__
#elif defined _MSC_VER
#pragma message("warning: use \"ruby/st.h\" instead of bare \"st.h\"")
#endif
#include "ruby/st.h"
2 changes: 1 addition & 1 deletion ThirdParty/include/ruby/win32_x64/ruby/backward/util.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#if defined __GNUC__
#warning use "ruby/util.h" instead of bare "util.h"
#elif defined _MSC_VER || defined __BORLANDC__
#elif defined _MSC_VER
#pragma message("warning: use \"ruby/util.h\" instead of bare \"util.h\"")
#endif
#include "ruby/util.h"
Loading

0 comments on commit b98f827

Please sign in to comment.