Added glide based dependency management

This commit is contained in:
Will Angenent 2018-05-27 11:48:03 +01:00
parent 024eebae61
commit ade84dc657
20 changed files with 81 additions and 73 deletions

2
.gitignore vendored
View File

@ -1,3 +1,5 @@
vendor
glide.lock
apple2
apple2.test
apple2e.rom

View File

@ -5,16 +5,15 @@ import (
"fmt"
"os"
"github.com/freewilll/apple2/audio"
"github.com/freewilll/apple2/cpu"
"github.com/freewilll/apple2/disk"
"github.com/freewilll/apple2/keyboard"
"github.com/freewilll/apple2/mmu"
"github.com/freewilll/apple2/system"
"github.com/freewilll/apple2/utils"
"github.com/freewilll/apple2/video"
"github.com/hajimehoshi/ebiten"
"apple2/audio"
"apple2/cpu"
"apple2/disk"
"apple2/keyboard"
"apple2/mmu"
"apple2/system"
"apple2/utils"
"apple2/video"
)
var showInstructions *bool

View File

@ -1,8 +1,6 @@
package audio
import (
"apple2/system"
)
import "github.com/freewilll/apple2/system"
func Click() {
ForwardToFrameCycle()

View File

@ -3,9 +3,8 @@ package audio
import (
"errors"
"github.com/freewilll/apple2/system"
ebiten_audio "github.com/hajimehoshi/ebiten/audio"
"apple2/system"
)
var (

View File

@ -3,13 +3,12 @@ package main
import (
"testing"
"github.com/freewilll/apple2/cpu"
"github.com/freewilll/apple2/keyboard"
"github.com/freewilll/apple2/mmu"
"github.com/freewilll/apple2/system"
"github.com/freewilll/apple2/video"
"github.com/stretchr/testify/assert"
"apple2/cpu"
"apple2/keyboard"
"apple2/mmu"
"apple2/system"
"apple2/video"
)
func TestBankSwitching(t *testing.T) {

View File

@ -4,11 +4,11 @@ import (
"fmt"
"testing"
"apple2/cpu"
"apple2/keyboard"
"apple2/mmu"
"apple2/system"
"apple2/video"
"github.com/freewilll/apple2/cpu"
"github.com/freewilll/apple2/keyboard"
"github.com/freewilll/apple2/mmu"
"github.com/freewilll/apple2/system"
"github.com/freewilll/apple2/video"
)
func testBellCycles(delay int) {

View File

@ -3,9 +3,9 @@ package main
import (
"flag"
"apple2/cpu"
"apple2/mmu"
"apple2/utils"
"github.com/freewilll/apple2/cpu"
"github.com/freewilll/apple2/mmu"
"github.com/freewilll/apple2/utils"
)
func main() {

View File

@ -4,8 +4,8 @@ import (
"fmt"
"os"
"apple2/mmu"
"apple2/system"
"github.com/freewilll/apple2/mmu"
"github.com/freewilll/apple2/system"
)
const (

View File

@ -5,11 +5,11 @@ import (
"fmt"
"testing"
"apple2/cpu"
"apple2/keyboard"
"apple2/mmu"
"apple2/system"
"apple2/utils"
"github.com/freewilll/apple2/cpu"
"github.com/freewilll/apple2/keyboard"
"github.com/freewilll/apple2/mmu"
"github.com/freewilll/apple2/system"
"github.com/freewilll/apple2/utils"
)
func TestCPU(t *testing.T) {

View File

@ -4,7 +4,7 @@ import (
"fmt"
"strings"
"apple2/mmu"
"github.com/freewilll/apple2/mmu"
)
func printFlag(p byte, flag uint8, code string) {

View File

@ -4,7 +4,7 @@ import (
"fmt"
"io/ioutil"
"apple2/system"
"github.com/freewilll/apple2/system"
)
const tracksPerDisk = 35

View File

@ -5,13 +5,13 @@ import (
"testing"
"time"
"apple2/cpu"
"apple2/disk"
"apple2/keyboard"
"apple2/mmu"
"apple2/system"
"apple2/utils"
"apple2/video"
"github.com/freewilll/apple2/cpu"
"github.com/freewilll/apple2/disk"
"github.com/freewilll/apple2/keyboard"
"github.com/freewilll/apple2/mmu"
"github.com/freewilll/apple2/system"
"github.com/freewilll/apple2/utils"
"github.com/freewilll/apple2/video"
)
const dosDiskImage = "dos33.dsk"

12
glide.yaml Normal file
View File

@ -0,0 +1,12 @@
package: github.com/freewilll/apple2
import:
- package: github.com/hajimehoshi/ebiten
version: ^1.7.0
subpackages:
- audio
- ebitenutil
testImport:
- package: github.com/stretchr/testify
version: ^1.2.1
subpackages:
- assert

View File

@ -3,13 +3,12 @@ package main
import (
"testing"
"github.com/freewilll/apple2/cpu"
"github.com/freewilll/apple2/keyboard"
"github.com/freewilll/apple2/mmu"
"github.com/freewilll/apple2/system"
"github.com/freewilll/apple2/video"
"github.com/stretchr/testify/assert"
"apple2/cpu"
"apple2/keyboard"
"apple2/mmu"
"apple2/system"
"apple2/video"
)
func TestIoBankSwitching(t *testing.T) {

View File

@ -3,10 +3,10 @@ package mmu
import (
"fmt"
"apple2/audio"
"apple2/disk"
"apple2/keyboard"
"apple2/system"
"github.com/freewilll/apple2/audio"
"github.com/freewilll/apple2/disk"
"github.com/freewilll/apple2/keyboard"
"github.com/freewilll/apple2/system"
)
// Adapted from

View File

@ -4,7 +4,7 @@ import (
"fmt"
"io/ioutil"
"apple2/system"
"github.com/freewilll/apple2/system"
)
const RomPath = "apple2e.rom"

View File

@ -5,13 +5,13 @@ import (
"testing"
"time"
"apple2/cpu"
"apple2/disk"
"apple2/keyboard"
"apple2/mmu"
"apple2/system"
"apple2/utils"
"apple2/video"
"github.com/freewilll/apple2/cpu"
"github.com/freewilll/apple2/disk"
"github.com/freewilll/apple2/keyboard"
"github.com/freewilll/apple2/mmu"
"github.com/freewilll/apple2/system"
"github.com/freewilll/apple2/utils"
"github.com/freewilll/apple2/video"
)
const prodosDiskImage = "prodos.dsk"

View File

@ -3,13 +3,13 @@ package main
import (
"testing"
"apple2/cpu"
"apple2/disk"
"apple2/keyboard"
"apple2/mmu"
"apple2/system"
"apple2/utils"
"apple2/video"
"github.com/freewilll/apple2/cpu"
"github.com/freewilll/apple2/disk"
"github.com/freewilll/apple2/keyboard"
"github.com/freewilll/apple2/mmu"
"github.com/freewilll/apple2/system"
"github.com/freewilll/apple2/utils"
"github.com/freewilll/apple2/video"
)
const rwtsDosDiskImage = "dos33.dsk"

View File

@ -8,8 +8,8 @@ import (
"os"
"testing"
"apple2/cpu"
"apple2/system"
"github.com/freewilll/apple2/cpu"
"github.com/freewilll/apple2/system"
)
func ReadMemoryFromGzipFile(filename string) (data []byte, err error) {

View File

@ -8,7 +8,7 @@ import (
"github.com/hajimehoshi/ebiten"
"github.com/hajimehoshi/ebiten/ebitenutil"
"apple2/mmu"
"github.com/freewilll/apple2/mmu"
)
const (
@ -43,7 +43,7 @@ func Init() {
}
// From
// https://mrob.com/pub/xapple2/colors.html
// https://mrob.com/pub/xgithub.com/freewilll/apple2/colors.html
// https://archive.org/details/IIgs_2523063_Master_Color_Values
alpha := uint8(0xff)