Skip to content
Snippets Groups Projects
Verified Commit 65f3fa81 authored by Recolic Keghart's avatar Recolic Keghart
Browse files

manually merge script fixes in master branch.

parent 70b3f4bd
No related branches found
No related tags found
1 merge request!4HUST codebase improvement suggestions
# ICS2018-HUST Recolic Public Template User Guide
> [中文版](https://translate.google.com/)
## Setup
Refer to https://git.recolic.org/snippets/14 . The only thing you need to do is: Clone this repo and modify your `~/.ssh/config`.
## Usage
> Assuming that you're familiar to basic git and linux operations.
#### Set environment variable
Run `make setup` as offical guide asked you to.
> Don't forget to modify your `config.fish/zsh.rc/...` if you're not using bash.
#### Writing Code
Use your favorite editor/IDE. Modify `.gitignore` as your will.
#### Build
`cd nemu && make`. Makefile will NEVER automatically generate a shitty commit.
#### Staging your modification (git add)
`git add -A`
#### Commit (git commit)
To make the teacher happy, you still need to call the *shitty commit generator* to create your commit.
```
cd nemu
# Equivalent to `git commit -m GENERATE_MESSAGE("your message")`
make git_gen M="Im doing something really good today. The shitty commit generator is not shitty anymore!"
```
Note that empty commit it not allowed anymore. It's unnecessary.
#### Push to remote repo (git push)
> You're not necessary to push your code to HUST repo at all! Use your github / gitlab to make yourself happy.
`git push`
#### Submit your PA
By default, the Makefile in this repo will use [my reverse proxy](https://git.recolic.org/snippets/14).
```
make submit
```
If you're in hust CERNET and don't want the slow proxy, modify the `hust_submit_server_host` variable in Makefile to the official one.
----------
# ICS2018 Programming Assignment
This project is the programming assignment of the class ICS(Introduction to Computer System) in Department of Computer Science and Technology, Nanjing University.
......
*.*
*
!*/
!Makefile*
!*.[cSh]
!.gitignore
!README.md
!runall.sh
......@@ -3,7 +3,7 @@ STUNAME = 刘本嵩
# DO NOT modify the following code!!!
GITFLAGS = -q --author='tracer-ics2018 <tracer@njuics.org>' --no-verify --allow-empty
GITFLAGS = -q
# prototype: git_commit(msg)
define git_commit_origin
......
......@@ -18,4 +18,5 @@ wiki="https://$hust_submit_server_host/teach/api/uploads/"
tarball=$(mktemp -q).tar.bz2
bash -c "cd .. && tar cj ${cwd} > ${tarball}"
echo curl -F "task=${task}" -F "id=${STUID}" -F "name=${STUNAME}" -F "submission=@${tarball}" ${wiki}upload
curl -F "task=${task}" -F "id=${STUID}" -F "name=${STUNAME}" -F "submission=@${tarball}" ${wiki}upload
curl -F "task=${task}" -F "id=${STUID}" -F "name=${STUNAME}" -F "submission=@${tarball}" ${wiki}upload -v ||
echo 'ERROR: Upload failed. Recolic proxy server is in HongKong and it"s slow, so you may try again.'
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment