Skip to content

Commit

Permalink
Merge branch 'pharo_dev' into pharo
Browse files Browse the repository at this point in the history
  • Loading branch information
dalehenrich committed Jun 24, 2015
2 parents fcfa8db + 7d96f5e commit e789b65
Show file tree
Hide file tree
Showing 528 changed files with 1,232 additions and 519 deletions.
2 changes: 1 addition & 1 deletion license.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ MIT License

Copyright (C) 2012 Sven Van Caekenberghe
Copyright (c) 2012 VMware, Inc. <[email protected]>.

Copyright (c) 2013 GemTalk Systems, LLC <[email protected]>.

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

Expand Down
3 changes: 3 additions & 0 deletions repository/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
*.package/monticello.meta/version merge=mcVersion
*.package/*.class/methodProperties.json merge=mcMethodProperties

Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ baseline: spec
spec
for: #'common'
do: [
spec package: 'Ston-Core'.
spec package: 'Ston-Tests' with: [ spec requires: 'Ston-Core' ].
spec package: 'STON-Core'.
spec package: 'STON-Tests' with: [ spec requires: 'STON-Core' ].
spec
group: 'default' with: #('Core');
group: 'Core' with: #('Ston-Core');
group: 'Tests' with: #('Ston-Tests') ]
group: 'Core' with: #('STON-Core');
group: 'Tests' with: #('STON-Tests') ]
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
"class" : {
},
"instance" : {
"baseline:" : "dkh 6/16/2012 09:53" } }
"baseline:" : "dkh 6/23/2015 13:41" } }
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"category" : "BaselineOfSton",
"classinstvars" : [
],
"classtraitcomposition" : "{}",
"classvars" : [
],
"commentStamp" : "",
Expand All @@ -12,5 +11,4 @@
"pools" : [
],
"super" : "BaselineOf",
"traitcomposition" : "{}",
"type" : "normal" }
2 changes: 1 addition & 1 deletion repository/BaselineOfSton.package/monticello.meta/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
(name 'BaselineOfSton-dkh.1' message 'first baseline' id '40015af9-4ad1-4c0b-912e-be0d1dc962a9' date '16 June 2012' time '9:54:51 am' author 'dkh' ancestors () stepChildren ())
(name 'BaselineOfSton-dkh.2' message 'update baseline with new package names' id '1e4cf3d4-4861-4671-aeb5-a3bbd0ab0ccf' date '23 June 2015' time '1:41:30.756372 pm' author 'dkh' ancestors ((name 'BaselineOfSton-dkh.1' message 'first baseline' id '40015af9-4ad1-4c0b-912e-be0d1dc962a9' date '16 June 2012' time '9:54:51 am' author 'dkh' ancestors () stepChildren ())) stepChildren ())
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
I am ConfigurationOfSton, a Metacello configuration to load the STON (Smalltalk Object Notation) project.

ConfigurationOfSton load.
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
development support
DevelopmentSupport

"See the methods in the 'development support' category on the class-side of MetacelloBaseConfiguration. Decide what development support methods you would like to use and copy them the the class-side of your configuration."
<apiDocumentation>
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
private
baseConfigurationClassIfAbsent: aBlock

^Smalltalk
at: #MetacelloBaseConfiguration
ifAbsent: [
self ensureMetacelloBaseConfiguration.
Smalltalk at: #MetacelloBaseConfiguration ifAbsent: aBlock ].
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
private
ensureMetacello

(self baseConfigurationClassIfAbsent: []) ensureMetacello
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
private
ensureMetacelloBaseConfiguration

Smalltalk
at: #MetacelloBaseConfiguration
ifAbsent: [
| repository version |
repository := MCHttpRepository location: 'http://seaside.gemstone.com/ss/metacello' user: '' password: ''.
repository
versionReaderForFileNamed: 'Metacello-Base-DaleHenrichs.2.mcz'
do: [ :reader |
version := reader version.
version load.
version workingCopy repositoryGroup addRepository: repository ] ]
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
metacello tool support
isMetacelloConfig
"Answer true and the Metacello tools will operate on you"

^true
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
loading
load
"Load the #stable version defined for this platform. The #stable version is the version that is recommended to be used on this platform."

"self load"

<apiDocumentation>
^(self project version: #stable) load
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
loading
loadBleedingEdge
"Load the latest versions of the mcz files defined for this project. It is not likely that the #bleedingEdge has been tested."

"self loadBleedingEdge"

<apiDocumentation>
^(self project version: #bleedingEdge) load
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
loading
loadDevelopment
"Load the #development version defined for this platform. The #development version will change over time and is not expected to be stable."

"self loadDevelopment"

<apiDocumentation>
^(self project version: #development) load
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
project

^self new project
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
development support
validate
"Check the configuration for Errors, Critical Warnings, and Warnings (see class comment for MetacelloMCVersionValidator for more information).
Errors identify specification issues that will result in unexpected behaviour when you load the configuration.
Critical Warnings identify specification issues that may result in unexpected behavior when you load the configuration.
Warnings identify specification issues that are technically correct, but are worth take a look at."

"self validate"

<apiDocumentation>
self ensureMetacello.
^ ((Smalltalk at: #MetacelloToolBox) validateConfiguration: self debug: #() recurse: false) explore
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
baselines
baseline01: spec
<version: '0.1-baseline'>

spec for: #'common' do: [
spec blessing: #'baseline'.
spec repository: 'http://ss3.gemstone.com/ss/STON'.
spec
package: 'Ston-Core';
package: 'Ston-Tests' ].
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
baselines
baseline02: spec
<version: '0.2-baseline'>

spec for: #'common' do: [
spec blessing: #'baseline'.
spec repository: 'http://ss3.gemstone.com/ss/STON'.
spec
package: 'STON-Core';
package: 'STON-Tests' ].
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
baselines
baseline03: spec
<version: '0.3-baseline'>

spec for: #'common' do: [
spec blessing: #'baseline'.
spec repository: 'http://ss3.gemstone.com/ss/STON'.
spec
package: 'STON-Core';
package: 'STON-Tests';
group: 'Core' with: #('STON-Core') ].
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
accessing
project

^ project ifNil: [ | constructor |
"Bootstrap Metacello if it is not already loaded"
(self class baseConfigurationClassIfAbsent: []) ensureMetacello.
"Construct Metacello project"
constructor := (Smalltalk at: #MetacelloVersionConstructor) on: self.
project := constructor project.
project loadType: #linear. "change to #atomic if desired"
project ]
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
symbolic versions
stable: spec
<symbolicVersion: #'stable'>

spec for: #'common' version: '0.9'
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
versions
version01: spec
<version: '0.1' imports: #('0.1-baseline' )>

spec for: #'common' do: [
spec blessing: #'release'.
spec description: ''.
spec author: 'SeanDeNigris'.
spec timestamp: '7/5/2012 19:06'.
spec
package: 'Ston-Core' with: 'Ston-Core-SvenVanCaekenberghe.35';
package: 'Ston-Tests' with: 'Ston-Tests-SvenVanCaekenberghe.33'. ].
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
versions
version02: spec
<version: '0.2' imports: #('0.1-baseline' )>

spec for: #'common' do: [
spec blessing: #'release'.
spec
package: 'Ston-Core' with: 'Ston-Core-SvenVanCaekenberghe.36';
package: 'Ston-Tests' with: 'Ston-Tests-SvenVanCaekenberghe.34'. ].
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
versions
version03: spec
<version: '0.3' imports: #('0.2-baseline' )>

spec for: #'common' do: [
spec blessing: #'release'.
spec
package: 'STON-Core' with: 'STON-Core-SvenVanCaekenberghe.37';
package: 'STON-Tests' with: 'STON-Tests-SvenVanCaekenberghe.29'. ]
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
versions
version04: spec
<version: '0.4' imports: #('0.2-baseline' )>

spec for: #'common' do: [
spec blessing: #'release'.
spec
package: 'STON-Core' with: 'STON-Core-SvenVanCaekenberghe.42';
package: 'STON-Tests' with: 'STON-Tests-SvenVanCaekenberghe.39'. ]
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
versions
version05: spec
<version: '0.5' imports: #('0.2-baseline' )>

spec for: #'common' do: [
spec
blessing: #'release';
package: 'STON-Core' with: 'STON-Core-SvenVanCaekenberghe.43';
package: 'STON-Tests' with: 'STON-Tests-SvenVanCaekenberghe.40' ]
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
versions
version06: spec
<version: '0.6' imports: #('0.3-baseline' )>

spec for: #'common' do: [
spec
blessing: #'release';
package: 'STON-Core' with: 'STON-Core-SvenVanCaekenberghe.45';
package: 'STON-Tests' with: 'STON-Tests-SvenVanCaekenberghe.42' ]
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
versions
version07: spec
<version: '0.7' imports: #('0.3-baseline' )>

spec for: #'common' do: [
spec
blessing: #'release';
package: 'STON-Core' with: 'STON-Core-DamienCassou.46';
package: 'STON-Tests' with: 'STON-Tests-SvenVanCaekenberghe.42' ]
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
versions
version08: spec
<version: '0.8' imports: #('0.3-baseline' )>

spec for: #'common' do: [
spec
blessing: #'release';
package: 'STON-Core' with: 'STON-Core-SvenVanCaekenberghe.47';
package: 'STON-Tests' with: 'STON-Tests-SvenVanCaekenberghe.42' ]
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
versions
version09: spec
<version: '0.9' imports: #('0.3-baseline' )>

spec for: #'common' do: [
spec
blessing: #'release';
package: 'STON-Core' with: 'STON-Core-SvenVanCaekenberghe.49';
package: 'STON-Tests' with: 'STON-Tests-SvenVanCaekenberghe.44' ]
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"class" : {
"DevelopmentSupport" : "SeanDeNigris 7/5/2012 19:06",
"baseConfigurationClassIfAbsent:" : "SeanDeNigris 7/5/2012 19:06",
"ensureMetacello" : "SeanDeNigris 7/5/2012 19:06",
"ensureMetacelloBaseConfiguration" : "SeanDeNigris 7/5/2012 19:06",
"isMetacelloConfig" : "SeanDeNigris 7/5/2012 19:06",
"load" : "SeanDeNigris 7/5/2012 19:06",
"loadBleedingEdge" : "SeanDeNigris 7/5/2012 19:06",
"loadDevelopment" : "SeanDeNigris 7/5/2012 19:06",
"project" : "SeanDeNigris 7/5/2012 19:06",
"validate" : "SeanDeNigris 7/5/2012 19:06" },
"instance" : {
"baseline01:" : "SeanDeNigris 7/5/2012 19:11",
"baseline02:" : "SvenVanCaekenberghe 10/26/2012 10:45",
"baseline03:" : "SvenVanCaekenberghe 11/28/2013 19:20",
"project" : "SeanDeNigris 7/5/2012 19:06",
"stable:" : "SvenVanCaekenberghe 4/24/2014 13:38",
"version01:" : "SeanDeNigris 7/5/2012 19:12",
"version02:" : "SvenVanCaekenberghe 10/25/2012 17:41",
"version03:" : "SvenVanCaekenberghe 10/26/2012 10:54",
"version04:" : "SvenVanCaekenberghe 12/18/2012 10:29",
"version05:" : "SvenVanCaekenberghe 3/7/2013 10:55",
"version06:" : "SvenVanCaekenberghe 11/28/2013 19:21",
"version07:" : "DamienCassou 12/11/2013 16:46",
"version08:" : "SvenVanCaekenberghe 1/21/2014 20:00",
"version09:" : "SvenVanCaekenberghe 4/24/2014 13:38" } }
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"category" : "ConfigurationOfSton",
"classinstvars" : [
],
"classvars" : [
"LastVersionLoad" ],
"commentStamp" : "<historical>",
"instvars" : [
"project" ],
"name" : "ConfigurationOfSton",
"pools" : [
],
"super" : "Object",
"type" : "normal" }
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SystemOrganization addCategory: #ConfigurationOfSton!
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
(name 'ConfigurationOfSton')
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
(name 'ConfigurationOfSton-SvenVanCaekenberghe.10' message 'update to #stable version 0.9' id 'e823770e-f9cb-42d6-b842-2333ee2f24be' date '24 April 2014' time '1:39:04.798633 pm' author 'SvenVanCaekenberghe' ancestors ((name 'ConfigurationOfSton-SvenVanCaekenberghe.9' message 'v8' id '4418cfaf-ea8a-45ea-95ec-4cbd05c1a971' date '21 January 2014' time '8:02:32.615635 pm' author 'SvenVanCaekenberghe' ancestors ((name 'ConfigurationOfSton-DamienCassou.8' message '- Display the position where the input error has been found' id 'bd00a1f9-f5d0-45d7-851f-228fd8f94706' date '11 December 2013' time '4:47:19.815382 pm' author 'DamienCassou' ancestors ((name 'ConfigurationOfSton-SvenVanCaekenberghe.7' message 'updated to stable version 6' id 'c32ddb48-b6e3-42a3-ace5-210057a2641e' date '28 November 2013' time '7:25:25.945748 pm' author 'SvenVanCaekenberghe' ancestors ((name 'ConfigurationOfSton-SvenVanCaekenberghe.6' message 'upgraded stable version to 0.5' id '013f1b17-0dc0-4a08-b461-7f5bf32d8043' date '7 March 2013' time '10:58:47.739 am' author 'SvenVanCaekenberghe' ancestors ((name 'ConfigurationOfSton-SvenVanCaekenberghe.5' message 'stable version 0.3' id '108c8bba-dc44-448e-87f9-4fd30837d87a' date '18 December 2012' time '10:31:05.469 am' author 'SvenVanCaekenberghe' ancestors ((name 'ConfigurationOfSton-SvenVanCaekenberghe.4' message 'fixed a typo' id '81a94d64-9fd5-466a-97e4-c6d76142a02b' date '26 October 2012' time '10:55:11.237 am' author 'SvenVanCaekenberghe' ancestors ((name 'ConfigurationOfSton-SvenVanCaekenberghe.3' message 'updated for Ston -> STON monticello package renaming' id 'c806692f-c2e5-4cca-aaaf-217a81b168d0' date '26 October 2012' time '10:49:54.117 am' author 'SvenVanCaekenberghe' ancestors ((name 'ConfigurationOfSton-SvenVanCaekenberghe.2' message 'added #allowComplexMapKeys option to STONReader (thx Norbert Hartl);added STONReader>>#reset' id '524b8ebd-9fec-43d4-ad03-cc19deabd23a' date '25 October 2012' time '5:42:27.266 pm' author 'SvenVanCaekenberghe' ancestors ((name 'ConfigurationOfSton-SeanDeNigris.1' message 'Initial version 0.1 declared stable for all platforms' id '59188559-57e8-4cc7-abef-b2753faa70ad' date '5 July 2012' time '7:15:15.718 pm' author 'SeanDeNigris' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
*ston-core
stonContainSubObjects
^ false
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"class" : {
},
"instance" : {
"stonContainSubObjects" : "SvenVanCaekenberghe 11/29/2012 16:24",
"stonOn:" : "SvenVanCaekenberghe 1/14/2012 15:53" } }
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
*ston-core
stonContainSubObjects
^ false
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"class" : {
"fromSton:" : "SvenVanCaekenberghe 2/12/2012 15:16" },
"instance" : {
"stonContainSubObjects" : "SvenVanCaekenberghe 11/29/2012 16:25",
"stonOn:" : "SvenVanCaekenberghe 2/12/2012 20:02" } }
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"class" : {
"fromSton:" : "SvenVanCaekenberghe 2/12/2012 15:17" },
"instance" : {
"stonOn:" : "SvenVanCaekenberghe 2/12/2012 20:02" } }
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"class" : {
},
"instance" : {
"stonName" : "SvenVanCaekenberghe 2/12/2012 20:06" } }
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"class" : {
"fromSton:" : "SvenVanCaekenberghe 2/12/2012 13:54" },
"instance" : {
"stonOn:" : "SvenVanCaekenberghe 4/29/2012 12:23:33" } }
Loading

0 comments on commit e789b65

Please sign in to comment.