Develop (#5)

* Develop of 0.2.0 established

* Globally accessible public macros prefixed with c64lib_ prefix

* CHANGES.md file introduced

* Gradle Wrapper added

* gradlew made executable

* Migrate to gradle retro assermbler plugin

* Fix in travis.yml

* Migrated to 0.3.0

* move to circleci, upgrade to ka 5.9

* fix on plugin version

* Migrate to retro 1.0.0

* Update Ka to 5.11, Ra to 1.0.1

* dep version update

* sprite and charset defition macros

* add default charset

* fixed import

* more work on charset

* Remove charsets

* Update README.md, build and vic2.asm

* Remove unused

* Changelog update

Author: maciejmaleckicg

.circleci/config.yml

@@ -0,0 +1,21 @@
+# Java Gradle CircleCI 2.0 configuration file
+version: 2
+jobs:
+  build:
+    branches:
+      only:
+        - master
+        - develop
+    docker:
+      - image: maciejmalecki/c64libci:0.1.4
+
+    working_directory: ~/repo
+
+    environment:
+      JVM_OPTS: -Xmx3200m
+      TERM: dumb
+
+    steps:
+      - checkout
+
+      - run: ./gradlew

.gitignore

@@ -1,4 +1,11 @@
-.cbm
 *.prg
 *.sym
-
+.asminfo.txt
+.source.txt
+# gradle
+.gradle
+build
+*.dbg
+*.vs
+.idea
+.ra

.travis.yml

@@ -1,11 +1,7 @@
 language: asm
 sudo: false
-before_install:
-  - source <(curl -SLs https://raw.githubusercontent.com/c64lib/travis-ci/master/install.sh)
 script:
-  - cpm common https://github.com/c64lib/common/archive/0.1.0.tar.gz 
-  - kall lib
-  - kall examples
+  - ./gradlew
 notifications:
   email:
     on_success: change

README.md

@@ -1,4 +1,13 @@
-# chipset
-
-* master: [![Build Status](https://travis-ci.org/c64lib/chipset.svg?branch=master)](https://travis-ci.org/c64lib/chipset) 
-* develop: [![Build Status](https://travis-ci.org/c64lib/chipset.svg?branch=develop)](https://travis-ci.org/c64lib/chipset)
+# c64lib/chipset
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
+[![Build Status](https://travis-ci.org/c64lib/chipset.svg?branch=master)](https://travis-ci.org/c64lib/chipset) 
+[![Build Status](https://travis-ci.org/c64lib/chipset.svg?branch=develop)](https://travis-ci.org/c64lib/chipset)
+[![Gitter](https://badges.gitter.im/c64lib/community.svg)](https://gitter.im/c64lib/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+
+## Change log
+### Changes in 0.2.0
+
+* Public symbols are now also declared as global in "-global.asm" files
+
+* New macro: `sprites.asm/sh` - define single line of hires sprite.
+* New macro: `sprites.asm/sm` - define single line of multicolor sprite.

build.gradle

@@ -0,0 +1,18 @@
+plugins {
+    id "com.github.c64lib.retro-assembler" version "1.1.0-rc01"
+}
+
+repositories {
+    jcenter()
+}
+
+apply plugin: "com.github.c64lib.retro-assembler"
+
+retroProject {
+    dialect = "KickAssembler"
+    dialectVersion = "5.13"
+    libDirs = ["..", ".ra/deps/c64lib"]
+
+    libFromGitHub "c64lib/common", "0.2.0"
+}
+

examples/e01-raster-irq.asm

@@ -2,10 +2,10 @@
  * Copper demo 1.
  */
 
-#import "common/lib/mem.asm"
+#import "common/lib/mem-global.asm"
 #import "../lib/cia.asm"
-#import "../lib/vic2.asm"
-#import "../lib/mos6510.asm"
+#import "../lib/vic2-global.asm"
+#import "../lib/mos6510-global.asm"
 
 .label IRQ_1 = 150
 .label IRQ_2 = 200
@@ -25,7 +25,7 @@ start:
   lda c64lib.CIA2_IRQ_CONTROL
   lda #c64lib.IMR_RASTER      // VIC-II is about to produce raster interrupt
   sta c64lib.IMR
-  setRaster(IRQ_1)
+  c64lib_setRaster(IRQ_1)
   lda #<irq1
   sta c64lib.IRQ_LO
   lda #>irq1
@@ -34,23 +34,23 @@ start:
   sta c64lib.NMI_LO
   lda #>irqFreeze
   sta c64lib.NMI_HI
-  configureMemory(c64lib.RAM_IO_RAM)  // turn off kernal, so that our vector becomes visible
+  c64lib_configureMemory(c64lib.RAM_IO_RAM)  // turn off kernal, so that our vector becomes visible
   cli
 block:
   jmp block                   // go into endless loop
   
 irq1: {  
-  irqEnter()
+  c64lib_irqEnter()
   inc c64lib.BG_COL_0         // change background color 
   inc c64lib.BORDER_COL       // change border color
-  irqExit(irq2, IRQ_2, false)
+  c64lib_irqExit(irq2, IRQ_2, false)
 }  
 
 irq2: {
-  irqEnter()
+  c64lib_irqEnter()
   dec c64lib.BG_COL_0         // change it back
   dec c64lib.BORDER_COL       // change it back
-  irqExit(irq1, IRQ_1, false)
+  c64lib_irqExit(irq1, IRQ_1, false)
 }
   
 irqFreeze: {

gradle/wrapper/gradle-wrapper.jar

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists