Browse Source

Fix gruntfile, finish bumping to >=0.20.0.

Herbert Vojčík 6 years ago
parent
commit
9faf8f9ab6
4 changed files with 7 additions and 11 deletions
  1. 2 2
      Gruntfile.js
  2. 2 4
      src/Axxord-Axon.js
  3. 2 4
      src/Axxord-Tests.js
  4. 1 1
      src/Axxord.st

+ 2 - 2
Gruntfile.js

@@ -41,8 +41,8 @@ module.exports = function (grunt) {
             },
             all: {
                 src: [
-                    'src/Axxord.st' // list all sources in dependency order
-                    // list all tests in dependency order
+                    'src/Axxord.st', 'src/Axxord-Axon.st', // list all sources in dependency order
+                    'src/Axxord-Tests.st' // list all tests in dependency order
                 ],
                 amd_namespace: 'axxord',
                 libraries: ['amber_core/SUnit', 'amber/web/Web']

+ 2 - 4
src/Axxord-Axon.js

@@ -1,11 +1,9 @@
 define(["amber/boot", "amber_core/Kernel-Exceptions", "amber_core/Kernel-Objects"], function($boot){"use strict";
-if(!$boot.nilAsReceiver)$boot.nilAsReceiver=$boot.nil;
 if(!("nilAsValue" in $boot))$boot.nilAsValue=$boot.nilAsReceiver;
 var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
-if(!$boot.nilAsClass)$boot.nilAsClass=$boot.dnu;
 $core.addPackage("Axxord-Axon");
-$core.packages["Axxord-Axon"].innerEval = function (expr) { return eval(expr); };
-$core.packages["Axxord-Axon"].transport = {"type":"amd","amdNamespace":"axxord"};
+($core.packageDescriptors||$core.packages)["Axxord-Axon"].innerEval = function (expr) { return eval(expr); };
+($core.packageDescriptors||$core.packages)["Axxord-Axon"].transport = {"type":"amd","amdNamespace":"axxord"};
 
 $core.addClass("Axon", $globals.Object, ["factory"], "Axxord-Axon");
 //>>excludeStart("ide", pragmas.excludeIdeData);

+ 2 - 4
src/Axxord-Tests.js

@@ -1,11 +1,9 @@
 define(["amber/boot", "amber_core/SUnit", "axxord/Axxord-Axon"], function($boot){"use strict";
-if(!$boot.nilAsReceiver)$boot.nilAsReceiver=$boot.nil;
 if(!("nilAsValue" in $boot))$boot.nilAsValue=$boot.nilAsReceiver;
 var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
-if(!$boot.nilAsClass)$boot.nilAsClass=$boot.dnu;
 $core.addPackage("Axxord-Tests");
-$core.packages["Axxord-Tests"].innerEval = function (expr) { return eval(expr); };
-$core.packages["Axxord-Tests"].transport = {"type":"amd","amdNamespace":"axxord"};
+($core.packageDescriptors||$core.packages)["Axxord-Tests"].innerEval = function (expr) { return eval(expr); };
+($core.packageDescriptors||$core.packages)["Axxord-Tests"].transport = {"type":"amd","amdNamespace":"axxord"};
 
 $core.addClass("AxolatorTest", $globals.TestCase, ["rootModel"], "Axxord-Tests");
 $core.addMethod(

+ 1 - 1
src/Axxord.st

@@ -1,5 +1,5 @@
 Smalltalk createPackage: 'Axxord'!
-(Smalltalk packageAt: 'Axxord') imports: {'axxord/Axxord-Axon'}!
+(Smalltalk packageAt: 'Axxord' ifAbsent: [ self error: 'Package not created: Axxord' ]) imports: {'axxord/Axxord-Axon'}!
 Object subclass: #Axes
 	instanceVariableNames: ''
 	package: 'Axxord'!