Browse Source

packaging updates

Odilitime 1 year ago
parent
commit
b8fe5dc78c

+ 21
- 9
README.md View File

@@ -33,7 +33,7 @@ These do not include mbedtls yet, if you know the correct package name for your
33 33
 Also will need either libmbedtls-dev (Debian 9/Ubuntu 16LTS (xenial)) or libpolarssl-dev (Debian 8 or earlier)
34 34
 
35 35
 #### Arch (and derivates)
36
-`sudo pacman -Suy glew glfw freetype2 harfbuzz`
36
+`sudo pacman -Suy glew glfw freetype2 harfbuzz mbedtls`
37 37
 
38 38
 #### Void
39 39
 `sudo xbps-install -S glew glfw harfbuzz-devel`
@@ -41,8 +41,8 @@ Also will need either libmbedtls-dev (Debian 9/Ubuntu 16LTS (xenial)) or libpola
41 41
 #### Gentoo
42 42
 `sudo emerge freetype harfbuzz glew glfw`
43 43
 
44
-#### Mac OS X
45
-`brew install glew glfw freetype harfbuzz mbedtls`
44
+### Mac OS X (Brew)
45
+`sudo brew install glew glfw freetype harfbuzz mbedtls`
46 46
 
47 47
 ## Binaries
48 48
 ### Linux
@@ -58,9 +58,11 @@ GyroNinja.net is back online
58 58
 ### Windows
59 59
 [2017-08-20 binary package](https://my.mixtape.moe/exebyr.zip)
60 60
 
61
-[Jenkins 32bit](https://nt-build-bot.rvx86.net:7421/job/netrunner-winnt-i686/)
61
+[32bit nightly package](https://nt-build-bot.rvx86.net/job/netrunner-winnt-i686/lastSuccessfulBuild/artifact/*zip*/archive.z)
62
+[64bit nightly package](https://nt-build-bot.rvx86.net/job/netrunner-winnt-amd64/lastSuccessfulBuild/artifact/*zip*/archive.z)
62 63
 
63
-[Jenkins 64bit](https://nt-build-bot.rvx86.net:7421/job/netrunner-winnt-amd64/)
64
+[Jenkins 32bit](https://nt-build-bot.rvx86.net/job/netrunner-winnt-i686/)
65
+[Jenkins 64bit](https://nt-build-bot.rvx86.net/job/netrunner-winnt-amd64/)
64 66
 
65 67
 ## Milestones
66 68
 - Browse 4chan /g/ board
@@ -79,6 +81,9 @@ Join IRC, compile the code, figure out something you want to improve
79 81
 - What about security?
80 82
 I don't think one on here could ever say they know what their doing without being laughed off the board. Security is a huge challenge to any project. We're going to do the best with the resources we have.
81 83
 
84
+## Contributing
85
+[Our style](https://en.wikipedia.org/wiki/Indent_style#Variant:_1TBS_.28OTBS.29)
86
+
82 87
 ## Who
83 88
 
84 89
 - Odilitime - Lead Developer
@@ -89,18 +94,25 @@ I don't think one on here could ever say they know what their doing without bein
89 94
   - Windows Dev, SSL Support
90 95
   - repo: https://gitgud.io/despair/netrunner/
91 96
 
97
+- Geertiebear
98
+  - OpenGL Shader rework
99
+  - repo:
100
+
101
+-
102
+
92 103
 - Nubben
93
-  - contributed local file code
104
+  - contributed local file code, WebResource, CommandLineParams, URL object
94 105
   - repo: https://github.com/nubben/netrunner
95 106
 
96 107
 - Tomleb
97
-  - contributed keyboard code
108
+  - contributed keyboard code and URL parser
98 109
   - repo: https://github.com/tomleb/netrunner
99 110
 
100 111
 - RetroTech - Web / Sys Admin
101 112
   - Created original website
113
+  - manages existing website
102 114
   - Helps manage archive of logos and threads
103
-  - set up etherpad for collaboration
115
+  - set up/manages etherpad for collaboration
104 116
 
105 117
 - Gyroninja - Jenkins
106 118
   - Was original Lead Developer (left to work on a servo-based project), Linux Dev, Did primary OOP planning and structure
@@ -137,4 +149,4 @@ We coordinate on [irc.rizon.net](https://www.rizon.net/chat) #/g/netrunner or [O
137 149
 ### Class Types
138 150
 - Nodes: DOM tree objects
139 151
 - Elements: Individual tag types
140
-- Components: (gameobjects) renderer entities
152
+- Components: (gameobjects) renderer entities

+ 11
- 11
reltools/darwin/package.sh View File

@@ -4,19 +4,19 @@ physicalCpuCount=$([[ $(uname) = 'Darwin' ]] &&
4 4
                        lscpu -p | egrep -v '^#' | sort -u -t, -k 2,4 | wc -l)
5 5
 mkdir netrunner-$(date +%F)
6 6
 cd netrunner-$(date +%F)
7
-cp ../*.dylib .
8
-cp ../../../*.ttf .
9
-cp ../../../anime.pnm .
10
-cp ../../../anime_blank.pnm .
11
-cp ../../../ca-bundle.crt .
7
+  cp ../*.dylib .
8
+  # this now has the ttfs and pnm
9
+  cp -r ../../../res .
10
+  rm res/.DS_Store
11
+  cp ../../../ca-bundle.crt .
12 12
 cd ../../../
13
-make -j$physicalCpuCount
13
+  make -j$physicalCpuCount
14 14
 cd reltools/darwin/netrunner-$(date +%F)
15
-cp ../../../netrunner .
16
-install_name_tool -change /usr/local/lib/libGLEW.2.0.0.dylib libGLEW.2.0.0.dylib netrunner
17
-install_name_tool -change /usr/local/lib/libfreetype.6.dylib libfreetype.6.dylib netrunner
18
-install_name_tool -change /usr/local/lib/libharfbuzz.0.dylib libharfbuzz.0.dylib netrunner
19
-otool -L netrunner
15
+  cp ../../../netrunner .
16
+  install_name_tool -change /usr/local/lib/libGLEW.2.0.0.dylib libGLEW.2.0.0.dylib netrunner
17
+  install_name_tool -change /usr/local/lib/libfreetype.6.dylib libfreetype.6.dylib netrunner
18
+  install_name_tool -change /usr/local/lib/libharfbuzz.0.dylib libharfbuzz.0.dylib netrunner
19
+  otool -L netrunner
20 20
 cd ..
21 21
 zip -r -X netrunner-$(date +%F)-darwin.zip netrunner-$(date +%F)
22 22
 rm -fr netrunner-$(date +%F)

+ 2
- 3
reltools/linux/package_from_darwin.sh View File

@@ -1,9 +1,8 @@
1 1
 #!/bin/bash
2 2
 mkdir netrunner-$(date +%F)
3 3
 cd netrunner-$(date +%F)
4
-  cp ../../../*.ttf .
5
-  cp ../../../anime.pnm .
6
-  cp ../../../anime_blank.pnm .
4
+  # this now has the ttfs and pnm
5
+  cp -r ../../../res .
7 6
   cp ../../../ca-bundle.crt .
8 7
   curl https://gyroninja.net:1615/job/NetRunner/lastSuccessfulBuild/artifact/netrunner > netrunner
9 8
 cd ..

+ 2
- 3
reltools/linux/package_from_linux.sh View File

@@ -1,9 +1,8 @@
1 1
 #!/bin/bash
2 2
 mkdir netrunner-$(date +%F)
3 3
 cd netrunner-$(date +%F)
4
-  cp ../../../*.ttf .
5
-  cp ../../../anime.pnm .
6
-  cp ../../../anime_blank.pnm .
4
+  # this now has the ttfs and pnm
5
+  cp -r ../../../res .
7 6
   cp ../../../ca-bundle.crt .
8 7
   cp ../../../netrunner .
9 8
 cd ..

+ 21
- 0
reltools/winnt/package_from_darwin.sh View File

@@ -0,0 +1,21 @@
1
+#!/bin/bash
2
+mkdir netrunner-$(date +%F)-32
3
+cd netrunner-$(date +%F)-32
4
+  # this now has the ttfs and pnm
5
+  cp -r ../../../res .
6
+  cp ../../../ca-bundle.crt .
7
+  curl https://nt-build-bot.rvx86.net/job/netrunner-winnt-i686/lastSuccessfulBuild/artifact/bin/netrunner.exe > netrunner32.exe
8
+cd ..
9
+zip -r -X netrunner-$(date +%F)-win32.zip netrunner-$(date +%F)-32
10
+rm -fr netrunner-$(date +%F)-32
11
+
12
+mkdir netrunner-$(date +%F)-64
13
+cd netrunner-$(date +%F)-64
14
+  # this now has the ttfs and pnm
15
+  cp -r ../../../res .
16
+  cp ../../../ca-bundle.crt .
17
+  curl https://nt-build-bot.rvx86.net/job/netrunner-winnt-amd64/lastSuccessfulBuild/artifact/bin/netrunner.exe > netrunner64.exe
18
+cd ..
19
+zip -r -X netrunner-$(date +%F)-win64.zip netrunner-$(date +%F)-64
20
+rm -fr netrunner-$(date +%F)-64
21
+# https://gitgud.io/snippets/29

anime_blank.pnm → res/anime_blank.pnm View File


Loading…
Cancel
Save