Skip to content

Commit

Permalink
Merge pull request #21 from ba-st/tonel-migration
Browse files Browse the repository at this point in the history
Tonel migration
  • Loading branch information
gcotelli authored Apr 18, 2018
2 parents ed9d082 + 93555dc commit 8e813eb
Show file tree
Hide file tree
Showing 1,618 changed files with 10,011 additions and 8,060 deletions.
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ smalltalk:
- Pharo64-7.0
- Pharo-7.0
- Pharo-6.1
- Pharo-6.0
- Pharo-5.0
matrix:
allow_failures:
- smalltalk: Pharo64-7.0
Expand Down
12 changes: 6 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ There's several ways to contribute to the project: reporting bugs, sending feedb

## How to report issues

The issue tracker is this GitHub repository. Please use the labels to categorize the issue.
The issue tracker is this GitHub repository. Please use the labels to categorize the issue.

## How to contribute code

Remember:
- This project is MIT licensed, so any code contribution must be under the same license.
- This project uses [semantic versioning](http://semver.org/), so keep it in mind when you make backwards-incompatible changes. If some backwards incompatible change is made the major version MUST be increased.
- The source code is hosted in this GitHub repository using the filetree format in the `source` folder. The master branch contains the latest changes, feel free to send pull requests or fork the project.
- The source code is hosted in this GitHub repository using the tonel format in the `source` folder. The master branch contains the latest changes, feel free to send pull requests or fork the project.
- Code contributions without test cases have a lower probability of being merged into the main branch.


Expand All @@ -22,15 +22,15 @@ The development version can be loaded in a Pharo 4/5 image evaluating the follow
```smalltalk
Metacello new
baseline: 'RenoirSt';
repository: 'filetree://REPO_LOCATION/source';
repository: 'tonel://REPO_LOCATION/source';
load: 'Development'.
```

or
or
```smalltalk
Metacello new
baseline: 'RenoirSt';
repository: 'filetree://REPO_LOCATION/source';
repository: 'tonel://REPO_LOCATION/source';
load: 'Development-Seaside-Extensions'.
```
if you want the Seaside extensions, where `REPO_LOCATION` is the location of the cloned repo in the local file system.
Expand All @@ -41,7 +41,7 @@ if you want the Seaside extensions, where `REPO_LOCATION` is the location of the

The project documentation is mantained in this GitHub repository in the `docs` folder. To contribute some documentation or improve the existing, feel free to create a branch or fork this repository, make your changes and send a pull request.

Remember the docs are licensed under a CC Attribution-ShareAlike license.
Remember the docs are licensed under a CC Attribution-ShareAlike license.

### Useful References:

Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2013-2017 Gabriel Cotelli, RenoirSt and Buenos Aires Smalltalk Contributors
Copyright (c) 2013-2018 Gabriel Cotelli, RenoirSt and Buenos Aires Smalltalk Contributors

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
2 changes: 0 additions & 2 deletions source/.filetree

This file was deleted.

3 changes: 3 additions & 0 deletions source/.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
#format : #tonel
}
5 changes: 0 additions & 5 deletions source/BaselineOfRenoirSt.package/.filetree

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Empty file.
1 change: 0 additions & 1 deletion source/BaselineOfRenoirSt.package/monticello.meta/package

This file was deleted.

1 change: 0 additions & 1 deletion source/BaselineOfRenoirSt.package/properties.json

This file was deleted.

70 changes: 70 additions & 0 deletions source/BaselineOfRenoirSt/BaselineOfRenoirSt.class.st
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
"
Metacello Baseline definition for RenoirSt
"
Class {
#name : #BaselineOfRenoirSt,
#superclass : #BaselineOf,
#category : 'BaselineOfRenoirSt'
}

{ #category : #baselines }
BaselineOfRenoirSt >> baseline: spec [

<baseline>
spec
for: #common
do: [ self setUpDependencies: spec.
self setUpGroups: spec.
self setUpSeasideGroups: spec.
spec group: 'default' with: #('Deployment') ]
]

{ #category : #private }
BaselineOfRenoirSt >> customProjectAttributes [

^ Array with: (Smalltalk globals at: #UnitValue ifPresent: [ :class | #UnitsIsLoaded ] ifAbsent: [ #UnitsIsAbsent ])
]

{ #category : #private }
BaselineOfRenoirSt >> setUpDependencies: spec [

spec
baseline: 'Buoy' with: [ spec repository: 'github://ba-st/Buoy:v4/source' ];
import: 'Buoy'.
spec
baseline: 'Seaside3'
with: [ spec
repository: 'github://SeasideSt/Seaside:v3.2.4/repository';
loads: 'Javascript' ];
import: 'Seaside3'

]

{ #category : #private }
BaselineOfRenoirSt >> setUpGroups: spec [

spec
package: 'RenoirSt' with: [ spec requires: 'Buoy' ];
package: 'RenoirSt-HTML' with: [ spec requires: 'RenoirSt' ];
package: 'RenoirSt-Tests' with: [ spec requires: 'RenoirSt' ];
package: 'RenoirSt-HTML-Tests' with: [ spec requires: #('RenoirSt-HTML' 'RenoirSt-Tests') ];
package: 'RenoirSt-UnitsCompatibility' with: [ spec requires: 'RenoirSt' ].

spec for: #UnitsIsLoaded do: [ spec group: 'Deployment' with: #('RenoirSt' 'RenoirSt-HTML' 'RenoirSt-UnitsCompatibility') ].
spec for: #UnitsIsAbsent do: [ spec group: 'Deployment' with: #('RenoirSt' 'RenoirSt-HTML') ].
spec group: 'Development' with: #('Deployment' 'RenoirSt-Tests' 'RenoirSt-HTML-Tests')
]

{ #category : #private }
BaselineOfRenoirSt >> setUpSeasideGroups: spec [

spec
package: 'RenoirSt-Seaside'
with: [ spec
requires: 'Deployment';
requires: 'Seaside3' ];
package: 'RenoirSt-Seaside-Tests' with: [ spec requires: 'RenoirSt-Seaside' ].
spec
group: 'Deployment-Seaside-Extensions' with: #('Deployment' 'RenoirSt-Seaside');
group: 'Development-Seaside-Extensions' with: #('Development' 'Deployment-Seaside-Extensions' 'RenoirSt-Seaside-Tests')
]
1 change: 1 addition & 0 deletions source/BaselineOfRenoirSt/package.st
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Package { #name : #BaselineOfRenoirSt }
5 changes: 0 additions & 5 deletions source/RenoirSt-HTML-Tests.package/.filetree

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 8e813eb

Please sign in to comment.