updated dev notes

doc/Developer-QuickStart-Linux.txt

@@ -1,4 +1,10 @@
-# ubuntu - X11 version
+# This is basically what you need to install to build this yourself,
+# or the pre-requisites of what you need to do to set up a build
+# machine as a gitlab ci runner.
+#
+# All instructions based on a Debian/Ubuntu OS, but should be 
+# relatively straightforward to modify for something like yum
+
 
 # system prep
 sudo apt-get -y update
@@ -6,21 +12,23 @@ sudo apt-get -y upgrade
 sudo apt-get -y install git
 sudo apt-get -y install g++
 sudo apt-get -y install libpcap0.8-dev
+sudo apt-get -y install libfreetype6-dev
+
+# X11 version
 sudo apt-get -y install libx11-dev
 sudo apt-get -y install libxext-dev
 
-# sdl
+# SDL version
 sudo apt-get -y install libsdl1.2-dev
-sudo apt-get -y install libsdl2-dev
-sudo apt-get -y install libfreetype6-dev
+sudo apt-get -y install libsdl-image1.2-dev
 
-# build
-git clone git@github.com:digarok/gsplus.git
+# SDL2 version
+sudo apt-get -y install libsdl2-dev
+sudo apt-get -y install libsdl2-image-dev
+
+
+# Example build to test out our system
 cd gsplus/src
-ln -s vars_x86linux_x11 vars
+ln -s vars_x86linux_sdl2 vars
 make clean ; make
 
-
-
-
-

doc/Developer-QuickStart-MacOSX.txt

@@ -4,8 +4,10 @@
 xcode-select --install
 
 # Install 'brew' if you don't already have it installed. 
+/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
 # then install dependencies
 brew install sdl2
+brew install sdl2_image
 brew install freetype
 
 # build
@@ -26,5 +28,3 @@ cd freetype-2.6.2
 make
 make install
 ln -s freetype-2.6.2 /usr/local/freetype
-
-

doc/GitlabCI-Runner-Linux.txt

@@ -9,14 +9,15 @@ sudo apt-get install -y gitlab-ci-multi-runner
 
 
 ## STEP 2 - Register it with your server
-sudo gitlab-ci-multi-runner register
-gitlab-ci-multi-runner register -n \
-  --url http://yourgitlab.com/ci \
-  --registration-token 5b2f60647cf7fe3eb5c7fa87e59bf7 \
+sudo gitlab-ci-multi-runner register -n \
+  --url http://centralserv.gotgeeks.com/ci \
+  --registration-token UqGC2qvJmvU1QBK3mx4b \
   --executor shell \
   --description "LinBuild" \
   --tag-list "ubuntu"
 
+# or manually
+sudo gitlab-ci-multi-runner register
 # "Please enter the gitlab-ci coordinator URL (e.g. https://gitlab.com/ci )"
 #  https://centralserv.gotgeeks.com/ci
 #

doc/GitlabCI-Runner-Win32.txt

@@ -1,3 +1,27 @@
+## PREREQUISITE AKA SETTING UP A FRESH VM OR DEV COMPUTER
+#
+# Install your Win7/Win10 VM
+# Install VirtualBox additions in your VM
+#
+# (optional)  add build user
+# Make user an admin, give it service privs
+#  ... Local Security Policy -> Local Policies -> User Rights Assignment -> Log on as a service
+#
+# install Cygwin
+# add cygwin bin dir to env path
+#
+# install git for windows w/ git bash  http://git-scm.com/download/win
+git config --global user.name "Dagen Brock"
+git config --global user.email "dagenbrock@gmail.com"
+# (set up your key(s))
+# Add your ~/.ssh/id_rsa using git bash (or cygwin) so that
+# gitlab runner can check out your project
+#
+# The project is currently being build in Cygwin.
+# I install Cygwin with all "Devel" and "Perl" packages.
+# I also search for and add any SDL2 or FreeType libs just in case.
+
+
 ## SOME NOTES ON SETTING UP GITLAB RUNNER TO BUILD ON WINDOWS
 # Based on: https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/blob/master/docs/install/windows.md
 
@@ -12,12 +36,12 @@ gitlab-ci-multi-runner-windows-386.exe register
 # enter gitlab url
 # enter gitlab runner token
 # enter tag of "windows"
-gitlab-ci-multi-runner register -n \
-  --url http://yourgitlab.com/ci \
-  --registration-token 5b2f60647cf7fe3eb5c7fa87e59bf7 \
+gitlab-runner.exe register -n \
+  --url http://centralserv.gotgeeks.com/ci \
+  --registration-token UqGC2qvJmvU1QBK3mx4b \
   --executor shell \
-  --description "WinDork10" \
-  --tag-list "windows,win32"
+  --description "WinBuild"
+  --tag-list "windows"
 
 gitlab-ci-multi-runner-windows-386.exe -n   --url http://centralserv.gotgeeks.com/ci   --registration-token 5a1f60647cf7fe3eb5c7fa87e59bf7   --executor shell   --description "WinDork10" --tag-list "windows,win32"
 
@@ -39,7 +63,7 @@ gitlab-ci-multi-runner-windows-386.exe start
 # If you have any other problems with the service not starting due to:
 # "Failed to start gitlab-runner: The service did not start due to a logon failure."
 # Try going to Services and edit the properties of the gitlab-runner service.
-# Go to the "Log On" tab and re-enter the password/credentials and see if 
+# Go to the "Log On" tab and re-enter the password/credentials and see if
 # that helps.
 
 
@@ -50,31 +74,6 @@ gitlab-ci-multi-runner-windows-386.exe start
 #       add:  shell = "bash"
 #
 # Also, make sure that if you type "bash" <enter>  from a CMD prompt,
-# that it runs the Cygwin shell.  If it can't find the bash command, 
+# that it runs the Cygwin shell.  If it can't find the bash command,
 # go to the Environment Variables Control Panel for your computer and
 # add "c:\cygwin\bin" to your PATH variable.
-
-
-
-
-
-## PREREQUISITE AKA SETTING UP A FRESH VM OR DEV COMPUTER
-#
-# don't forget guest additions in your VM
-#
-# add user (make it an admin, give it service privs) 
-# Local Security Policy -> Local Policies -> User Rights Assignment -> Log on as a service
-#
-# install Cygwin
-# add cygwin bin dir to env path
-#
-# install git for windows w/ git bash  http://git-scm.com/download/win
-git config --global user.name "Dagen Brock"
-git config --global user.email "dagenbrock@gmail.com"
-# (set up your key(s))
-# Add your ~/.ssh/id_rsa using git bash (or cygwin) so that 
-# gitlab runner can check out your project
-# 
-# The project is currently being build in Cygwin.
-# I install Cygwin with all "Devel" and "Perl" packages.
-# I also search for and add any SDL2 or FreeType libs just in case.